diff --git a/config/devices.properties b/config/devices.properties
index a45fef2..4eaa7df 100644
--- a/config/devices.properties
+++ b/config/devices.properties
@@ -9,4 +9,7 @@ scintillatorY=ch.psi.pshell.epics.Motor X10SA-ES-MIC:TRY3 false
 scintillatorZ=ch.psi.pshell.epics.Positionable X10SA-ES-SCINTI:SET-FOCUS X10SA-ES-SCINTI:GET-FOCUS
 detectorZ=ch.psi.pshell.epics.Motor X10SA-ES-D:TRZ1 false
 detectorY=ch.psi.pshell.epics.Motor X10SA-ES-D:TRY1 false
-aperture=ch.psi.pshell.dev.MotorGroupBase apertureX apertureY
+apertureTable=ch.psi.pshell.dev.MotorGroupBase apertureX apertureY
+beamstopTable=ch.psi.pshell.dev.MotorGroupBase beamstopX beamstopY beamstopZ
+collimatorTable=ch.psi.pshell.dev.MotorGroupBase collimatorX collimatorY
+scintillatorTable=ch.psi.pshell.dev.MotorGroupBase scintillatorY scintillatorZ