diff --git a/config/devices.properties b/config/devices.properties
index f180422..c2be4dc 100644
--- a/config/devices.properties
+++ b/config/devices.properties
@@ -1,29 +1,32 @@
-#diode=ch.psi.pshell.epics.ChannelDouble X06DA-ES-KBOX_K:READOUT Read 6 
-$shutter=ch.psi.pshell.epics.ChannelInteger X06DA-ES-PH1:SET
-omega=ch.psi.pshell.epics.Positionable X06DA-ES-DF1:OMEGA-VAL X06DA-ES-DF1:OMEGA-RBV
-x=ch.psi.pshell.epics.Positionable X06DA-ES-DF1:GMX-VAL X06DA-ES-DF1:GMX-RBV
-cy=ch.psi.pshell.epics.Motor X06DA-ES-DFS:TRY1
-cz=ch.psi.pshell.epics.Motor X06DA-ES-DFS:TRZ1
-#apertureX=ch.psi.pshell.epics.Motor X06DA-ES-MIC:TRX1
-#apertureY=ch.psi.pshell.epics.Motor X06DA-ES-MIC:TRY1
-beamstopX=ch.psi.pshell.epics.Motor X06DA-ES-BS:TRX1 
-beamstopY=ch.psi.pshell.epics.Motor X06DA-ES-BS:TRY1
-beamstopZ=ch.psi.pshell.epics.Motor X06DA-ES-BS:TRZ1
-#collimatorX=ch.psi.pshell.epics.Motor X06DA-ES-MIC:TRX2
-#collimatorY=ch.psi.pshell.epics.Motor X06DA-ES-MIC:TRY2
-#scintillatorY=ch.psi.pshell.epics.Motor X06DA-ES-MIC:TRY3
-#scintillatorZ=ch.psi.pshell.epics.Positionable X06DA-ES-SCINTI:SET-FOCUS X06DA-ES-SCINTI:GET-FOCUS
-#detectorZ=ch.psi.pshell.epics.Motor X06DA-ES-D:TRZ1
-#detectorY=ch.psi.pshell.epics.Motor X06DA-ES-D:TRY1
-#apertureTable=ch.psi.pshell.device.MotorGroupBase apertureX apertureY
-beamstop=ch.psi.pshell.device.MotorGroupDiscretePositioner beamstopX beamstopY beamstopZ
-collimator=ch.psi.pshell.device.MotorGroupDiscretePositioner collimatorX collimatorY
-aperture=ch.psi.pshell.device.MotorGroupDiscretePositioner apertureX apertureY
-scintillator=ch.psi.pshell.device.MotorGroupDiscretePositioner scintillatorY
-slit1H=ch.psi.pshell.epics.Slit X06DA-OP-SH1:TRX2 X06DA-OP-SH1:TRX1
-#slit1V=ch.psi.pshell.epics.Slit X06DA-OP-SV1:TRY1 X06DA-OP-SV1:TRY2
-#slit2H=ch.psi.pshell.epics.Slit X06DA-OP-SH2:TRX2 X06DA-OP-SH2:TRX1
-#slit2V=ch.psi.pshell.epics.Slit X06DA-OP-SV2:TRY1 X06DA-OP-SV2:TRY2
-lamp=ch.psi.pshell.epics.DiscretePositioner 
-#backlight=ch.psi.pshell.epics.ProcessVariable X06DA-ES-KOI:SET-LIGHT
-#frontlight=ch.psi.pshell.epics.ProcessVariable X06DA-ES-FL1:SET-LIGHT
+#diode=ch.psi.pshell.epics.ChannelDouble|X06DA-ES-KBOX_K:READOUT Read 6|||
+cats_block=ch.psi.pshell.epics.BinaryPositioner|X06DA-ES-CATS:BLOCKED|Read||
+exp_shutter=ch.psi.pshell.epics.BinaryPositioner|X06DA-ES-PH1:SET X06DA-ES-PH1:GET|Read||
+ketek=ch.psi.pshell.epics.BinaryPositioner|X06DA-ES-FD:SET-POS X06DA-ES-FD:GET-POS|Read||
+beam_stop_pos=ch.psi.pshell.epics.BinaryPositioner|X06DA-ES-BS:SET-POS X06DA-ES-BS:GET-POS|Read||
+#det_cover=ch.psi.pshell.epics.DiscretePositioner|X06DA-ES-PILCOV:SET|||
+omega=ch.psi.pshell.epics.Positionable|X06DA-ES-DF1:OMEGA-VAL X06DA-ES-DF1:OMEGA-RBV|||
+x=ch.psi.pshell.epics.Positionable|X06DA-ES-DF1:GMX-VAL X06DA-ES-DF1:GMX-RBV|||
+cy=ch.psi.pshell.epics.Motor|X06DA-ES-DFS:TRY1|||
+cz=ch.psi.pshell.epics.Motor|X06DA-ES-DFS:TRZ1|||
+#aperture_x=ch.psi.pshell.epics.Motor|X06DA-ES-MIC:TRX1|||
+#aperture_y=ch.psi.pshell.epics.Motor|X06DA-ES-MIC:TRY1|||
+beamstop_x=ch.psi.pshell.epics.Motor|X06DA-ES-BS:TRX1|||
+beamstop_y=ch.psi.pshell.epics.Motor|X06DA-ES-BS:TRY1|||
+beamstop_z=ch.psi.pshell.epics.Motor|X06DA-ES-BS:TRZ1|||
+#collimator_x=ch.psi.pshell.epics.Motor|X06DA-ES-MIC:TRX2|||
+#collimator_y=ch.psi.pshell.epics.Motor|X06DA-ES-MIC:TRY2|||
+#scintillator_y=ch.psi.pshell.epics.Motor|X06DA-ES-MIC:TRY3|||
+#scintillator_z=ch.psi.pshell.epics.Positionable|X06DA-ES-SCINTI:SET-FOCUS X06DA-ES-SCINTI:GET-FOCUS|||
+#detector_z=ch.psi.pshell.epics.Motor|X06DA-ES-D:TRZ1|||
+#detector_y=ch.psi.pshell.epics.Motor|X06DA-ES-D:TRY1|||
+#aperture=ch.psi.pshell.device.MotorGroupDiscretePositioner|apertureX apertureY|||
+#beamstop=ch.psi.pshell.device.MotorGroupDiscretePositioner|beamstopX beamstopY beamstopZ|||
+#collimator=ch.psi.pshell.device.MotorGroupDiscretePositioner|collimatorX collimatorY|||
+#scintillator=ch.psi.pshell.device.MotorGroupDiscretePositioner|scintillatorY|||
+slit1h=ch.psi.pshell.epics.Slit|X06DA-OP-SH1:TRX2 X06DA-OP-SH1:TRX1|||
+#slit1V=ch.psi.pshell.epics.Slit|X06DA-OP-SV1:TRY1 X06DA-OP-SV1:TRY2|||
+#slit2H=ch.psi.pshell.epics.Slit|X06DA-OP-SH2:TRX2 X06DA-OP-SH2:TRX1|||
+#slit2V=ch.psi.pshell.epics.Slit|X06DA-OP-SV2:TRY1 X06DA-OP-SV2:TRY2|||
+lamp=ch.psi.pshell.epics.DiscretePositioner||||
+#backlight=ch.psi.pshell.epics.ProcessVariable|X06DA-ES-KOI:SET-LIGHT|||
+#frontlight=ch.psi.pshell.epics.ProcessVariable|X06DA-ES-FL1:SET-LIGHT|||