diff --git a/xtreme_bec/device_configs/endstation.yaml b/xtreme_bec/device_configs/endstation.yaml
index f8bf0c6..0f4636e 100644
--- a/xtreme_bec/device_configs/endstation.yaml
+++ b/xtreme_bec/device_configs/endstation.yaml
@@ -12,7 +12,7 @@ valve:
 goldmesh1:
   readoutPriority: baseline
   description: 'Gold mesh 1'
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotor
   deviceConfig:
     prefix: 'X07MA-OP-IO1:TR1'
   onFailure: retry
@@ -23,7 +23,7 @@ goldmesh1:
 goldmesh2:
   readoutPriority: baseline
   description: 'Gold mesh 2'
-  deviceClass: ophyd.EpicsMotor
+  deviceClass: ophyd_devices.EpicsMotor
   deviceConfig:
     prefix: 'X07MA-OP-IO2:TR1'
   onFailure: retry
diff --git a/xtreme_bec/device_configs/optics.yaml b/xtreme_bec/device_configs/optics.yaml
index 80c8690..be19f34 100644
--- a/xtreme_bec/device_configs/optics.yaml
+++ b/xtreme_bec/device_configs/optics.yaml
@@ -1,3 +1,58 @@
+cmu_rox:
+  readoutPriority: baseline
+  description: 'Collimating mirror rotation x'
+  deviceClass: ophyd_devices.EpicsMotor
+  deviceConfig:
+    prefix: 'X07MA-OP-CMU:ROX'
+  onFailure: retry
+  enabled: true
+  readOnly: false
+  softwareTrigger: false
+
+cmu_roy:
+  readoutPriority: baseline
+  description: 'Collimating mirror rotation y'
+  deviceClass: ophyd_devices.EpicsMotor
+  deviceConfig:
+    prefix: 'X07MA-OP-CMU:ROY'
+  onFailure: retry
+  enabled: true
+  readOnly: false
+  softwareTrigger: false
+
+cmu_roz:
+  readoutPriority: baseline
+  description: 'Collimating mirror rotation z'
+  deviceClass: ophyd_devices.EpicsMotor
+  deviceConfig:
+    prefix: 'X07MA-OP-CMU:ROZ'
+  onFailure: retry
+  enabled: true
+  readOnly: false
+  softwareTrigger: false
+
+cmu_try:
+  readoutPriority: baseline
+  description: 'Collimating mirror translation y'
+  deviceClass: ophyd_devices.EpicsMotor
+  deviceConfig:
+    prefix: 'X07MA-OP-CMU:TRY'
+  onFailure: retry
+  enabled: true
+  readOnly: false
+  softwareTrigger: false
+
+cmu_trz:
+  readoutPriority: baseline
+  description: 'Collimating mirror translation z'
+  deviceClass: ophyd_devices.EpicsMotor
+  deviceConfig:
+    prefix: 'X07MA-OP-CMU:TRZ'
+  onFailure: retry
+  enabled: true
+  readOnly: false
+  softwareTrigger: false
+
 mono:
   readoutPriority: baseline
   description: 'PGM Monochromator'
@@ -7,4 +62,125 @@ mono:
   onFailure: retry
   enabled: true
   readOnly: false
+  softwareTrigger: false
+
+fmu_rox:
+  readoutPriority: baseline
+  description: 'Focusing mirror rotation x'
+  deviceClass: ophyd_devices.EpicsMotor
+  deviceConfig:
+    prefix: 'X07MA-OP-FMU:ROX'
+  onFailure: retry
+  enabled: true
+  readOnly: false
+  softwareTrigger: false
+
+fmu_roy:
+  readoutPriority: baseline
+  description: 'Focusing mirror rotation y'
+  deviceClass: ophyd_devices.EpicsMotor
+  deviceConfig:
+    prefix: 'X07MA-OP-FMU:ROY'
+  onFailure: retry
+  enabled: true
+  readOnly: false
+  softwareTrigger: false
+
+fmu_roz:
+  readoutPriority: baseline
+  description: 'Focusing mirror rotation z'
+  deviceClass: ophyd_devices.EpicsMotor
+  deviceConfig:
+    prefix: 'X07MA-OP-FMU:ROZ'
+  onFailure: retry
+  enabled: true
+  readOnly: false
+  softwareTrigger: false
+
+fmu_try:
+  readoutPriority: baseline
+  description: 'Focusing mirror translation y'
+  deviceClass: ophyd_devices.EpicsMotor
+  deviceConfig:
+    prefix: 'X07MA-OP-FMU:TRY'
+  onFailure: retry
+  enabled: true
+  readOnly: false
+  softwareTrigger: false
+
+fmu_trz:
+  readoutPriority: baseline
+  description: 'Focusing mirror translation z'
+  deviceClass: ophyd_devices.EpicsMotor
+  deviceConfig:
+    prefix: 'X07MA-OP-FMU:TRZ'
+  onFailure: retry
+  enabled: true
+  readOnly: false
+  softwareTrigger: false
+
+exit_slit:
+  readoutPriority: baseline
+  description: 'Aperture between focusing and refocusing mirror'
+  deviceClass: ophyd_devices.EpicsSignal
+  deviceConfig:
+    read_pv: 'X07MA-OP-SL1SV1:TR_AP'
+  onFailure: retry
+  enabled: true
+  readOnly: false
+  softwareTrigger: false
+
+rmu_rox:
+  readoutPriority: baseline
+  description: 'Refocusing mirror rotation x'
+  deviceClass: ophyd_devices.EpicsMotor
+  deviceConfig:
+    prefix: 'X07MA-OP-RMU:ROX'
+  onFailure: retry
+  enabled: true
+  readOnly: false
+  softwareTrigger: false
+
+rmu_roy:
+  readoutPriority: baseline
+  description: 'Refocusing mirror rotation y'
+  deviceClass: ophyd_devices.EpicsMotor
+  deviceConfig:
+    prefix: 'X07MA-OP-RMU:ROY'
+  onFailure: retry
+  enabled: true
+  readOnly: false
+  softwareTrigger: false
+
+rmu_roz:
+  readoutPriority: baseline
+  description: 'Refocusing mirror rotation z'
+  deviceClass: ophyd_devices.EpicsMotor
+  deviceConfig:
+    prefix: 'X07MA-OP-RMU:ROZ'
+  onFailure: retry
+  enabled: true
+  readOnly: false
+  softwareTrigger: false
+
+rmu_try:
+  readoutPriority: baseline
+  description: 'Refocusing mirror translation y'
+  deviceClass: ophyd_devices.EpicsMotor
+  deviceConfig:
+    prefix: 'X07MA-OP-RMU:TRY'
+  onFailure: retry
+  enabled: true
+  readOnly: false
+  softwareTrigger: false
+
+rmu_trz:
+  readoutPriority: baseline
+  description: 'Refocusing mirror translation z'
+  deviceClass: ophyd_devices.EpicsMotor
+  deviceConfig:
+    prefix: 'X07MA-OP-RMU:TRZ'
+  onFailure: retry
+  enabled: true
+  readOnly: false
   softwareTrigger: false
\ No newline at end of file