diff --git a/xtreme_bec/device_configs/endstation.yaml b/xtreme_bec/device_configs/endstation.yaml
index f8bf0c6..d1e5627 100644
--- a/xtreme_bec/device_configs/endstation.yaml
+++ b/xtreme_bec/device_configs/endstation.yaml
@@ -1,102 +1,120 @@
 valve:
   readoutPriority: baseline
-  description: 'Endstation valve'
+  description: "Endstation valve"
   deviceClass: xtreme_bec.devices.VacuumValve
   deviceConfig:
-    prefix: 'X07MA-OP-VG13:'
+    prefix: "X07MA-OP-VG13:"
   onFailure: retry
   enabled: true
   readOnly: false
   softwareTrigger: false
+  deviceTags:
+    - endstation
 
 goldmesh1:
   readoutPriority: baseline
-  description: 'Gold mesh 1'
-  deviceClass: ophyd.EpicsMotor
+  description: "Gold mesh 1"
+  deviceClass: ophyd_devices.EpicsMotor
   deviceConfig:
-    prefix: 'X07MA-OP-IO1:TR1'
+    prefix: "X07MA-OP-IO1:TR1"
   onFailure: retry
   enabled: true
   readOnly: false
   softwareTrigger: false
+  deviceTags:
+    - endstation
 
 goldmesh2:
   readoutPriority: baseline
-  description: 'Gold mesh 2'
-  deviceClass: ophyd.EpicsMotor
+  description: "Gold mesh 2"
+  deviceClass: ophyd_devices.EpicsMotor
   deviceConfig:
-    prefix: 'X07MA-OP-IO2:TR1'
+    prefix: "X07MA-OP-IO2:TR1"
   onFailure: retry
   enabled: true
   readOnly: false
   softwareTrigger: false
+  deviceTags:
+    - endstation
 
 field_x:
   readoutPriority: baseline
-  description: 'Magnetic field x'
+  description: "Magnetic field x"
   deviceClass: xtreme_bec.devices.X07MAMagnetAxis
   deviceConfig:
     axis_id: X
     ps_prefix: "X07MA-PC-PS2:"
-    prefix: 'X07MA-PC-MAG:'
+    prefix: "X07MA-PC-MAG:"
   onFailure: retry
   enabled: true
   readOnly: false
   softwareTrigger: false
+  deviceTags:
+    - endstation
 
 field_z:
   readoutPriority: baseline
-  description: 'Magnetic field z'
+  description: "Magnetic field z"
   deviceClass: xtreme_bec.devices.X07MAMagnetAxis
   deviceConfig:
     axis_id: Z
     ps_prefix: "X07MA-PC-PS1:"
-    prefix: 'X07MA-PC-MAG:'
+    prefix: "X07MA-PC-MAG:"
   onFailure: retry
   enabled: true
   readOnly: false
   softwareTrigger: false
+  deviceTags:
+    - endstation
 
 keithley_1:
   readoutPriority: baseline
-  description: 'Keithley 1 / 428 tey'
+  description: "Keithley 1 / 428 tey"
   deviceClass: ophyd.EpicsSignal
   deviceConfig:
-    read_pv: 'X07MA-PC-K428:1:setGain'
+    read_pv: "X07MA-PC-K428:1:setGain"
   onFailure: retry
   enabled: true
   readOnly: false
   softwareTrigger: false
+  deviceTags:
+    - endstation
 
 keithley_2:
   readoutPriority: baseline
-  description: 'Keithley 2 / 428 i0'
+  description: "Keithley 2 / 428 i0"
   deviceClass: ophyd.EpicsSignal
   deviceConfig:
-    read_pv: 'X07MA-PC-K428:2:setGain'
+    read_pv: "X07MA-PC-K428:2:setGain"
   onFailure: retry
   enabled: true
   readOnly: false
   softwareTrigger: false
+  deviceTags:
+    - endstation
 
 keithley_3:
   readoutPriority: baseline
-  description: 'Keithley 3 / 428 diode'
+  description: "Keithley 3 / 428 diode"
   deviceClass: ophyd.EpicsSignal
   deviceConfig:
-    read_pv: 'X07MA-PC-K428:3:setGain'
+    read_pv: "X07MA-PC-K428:3:setGain"
   onFailure: retry
   enabled: true
   readOnly: false
   softwareTrigger: false
+  deviceTags:
+    - endstation
 
 temperature:
   readoutPriority: baseline
-  description: 'Temperature controller'
+  description: "Temperature controller"
   deviceClass: xtreme_bec.devices.X07MATemperatureController
   deviceConfig:
-    prefix: 'X07MA-PC-TC:'
+    prefix: "X07MA-PC-TC:"
   onFailure: retry
   enabled: true
   readOnly: false
-  softwareTrigger: false
\ No newline at end of file
+  softwareTrigger: false
+  deviceTags:
+    - endstation
diff --git a/xtreme_bec/device_configs/frontend.yaml b/xtreme_bec/device_configs/frontend.yaml
index 529c199..cd6bc6e 100644
--- a/xtreme_bec/device_configs/frontend.yaml
+++ b/xtreme_bec/device_configs/frontend.yaml
@@ -1,209 +1,209 @@
 idgap:
-  description: 'Motor to control the IDGap of X07MA'
+  description: "Motor to control the IDGap of X07MA"
   deviceClass: ophyd_devices.devices.undulator.UndulatorGap
-  deviceConfig: 
-    prefix: 'X07MA-UIND:'
+  deviceConfig:
+    prefix: "X07MA-UIND:"
   onFailure: retry
   enabled: true
   readoutPriority: baseline
-  readOnly: false 
+  readOnly: false
   softwareTrigger: false
+  deviceTags:
+    - frontend
 
 uind_mode:
-  description: 'UIND mode of X07MA'
+  description: "UIND mode of X07MA"
   deviceClass: xtreme_bec.devices.uind_mode.UIndMode
   deviceConfig:
   onFailure: retry
   enabled: true
   readoutPriority: baseline
-  readOnly: false 
+  readOnly: false
   softwareTrigger: false
+  deviceTags:
+    - frontend
 
 uind_harmonic:
   readoutPriority: baseline
-  description: 'Undulator harmonic'
+  description: "Undulator harmonic"
   deviceClass: ophyd.EpicsSignalRO
   deviceConfig:
-    read_pv: 'X07MA-UIND:HARMONIC'
+    read_pv: "X07MA-UIND:HARMONIC"
     auto_monitor: true
   onFailure: retry
   enabled: true
   readOnly: false
   softwareTrigger: false
+  deviceTags:
+    - frontend
 
 uind_energy:
   readoutPriority: baseline
-  description: 'Undulator energy'
+  description: "Undulator energy"
   deviceClass: ophyd.EpicsSignalRO
   deviceConfig:
-    read_pv: 'X07MA-UIND:ENERGY-RBV'
+    read_pv: "X07MA-UIND:ENERGY-RBV"
     auto_monitor: true
   onFailure: retry
   enabled: true
   readOnly: false
   softwareTrigger: false
-
+  deviceTags:
+    - frontend
 
 energy:
   readoutPriority: baseline
-  description: 'Energy in eV'
+  description: "Energy in eV"
   deviceClass: ophyd.EpicsSignal
   deviceConfig:
-    read_pv: 'X07MA-PHS-E:GO.A'
+    read_pv: "X07MA-PHS-E:GO.A"
     auto_monitor: true
   onFailure: retry
   enabled: true
   readOnly: false
   softwareTrigger: false
+  deviceTags:
+    - frontend
 
 energy_mode:
   readoutPriority: baseline
-  description: 'Energy mode. Either PGM = 0 or PGM+ID = 1'
+  description: "Energy mode. Either PGM = 0 or PGM+ID = 1"
   deviceClass: ophyd.EpicsSignal
   deviceConfig:
-    read_pv: 'X07MA-PHS-E:OPT'
+    read_pv: "X07MA-PHS-E:OPT"
   onFailure: retry
   enabled: true
   readOnly: false
   softwareTrigger: false
+  deviceTags:
+    - frontend
 
 sl1xi:
-  description: 'slit 1 (frontend) x ring'
+  description: "slit 1 (frontend) x ring"
   deviceClass: ophyd_devices.EpicsMotorEC
-  deviceConfig: 
-    prefix: 'X07MA-FE-SL1:TRXR'
+  deviceConfig:
+    prefix: "X07MA-FE-SL1:TRXR"
   onFailure: raise
   enabled: true
   readoutPriority: baseline
   readOnly: false
   softwareTrigger: false
   deviceTags:
-  - xtreme
-  - frontend
+    - frontend
 
 sl1xo:
-  description: 'slit 1 (frontend) x wall'
+  description: "slit 1 (frontend) x wall"
   deviceClass: ophyd_devices.EpicsMotorEC
-  deviceConfig: 
-    prefix: 'X07MA-FE-SL1:TRXW'
+  deviceConfig:
+    prefix: "X07MA-FE-SL1:TRXW"
   onFailure: raise
   enabled: true
   readoutPriority: baseline
   readOnly: false
   softwareTrigger: false
   deviceTags:
-  - xtreme
-  - frontend
+    - frontend
 
 sl1yb:
-  description: 'slit 1 (frontend) y bottom'
+  description: "slit 1 (frontend) y bottom"
   deviceClass: ophyd_devices.EpicsMotorEC
-  deviceConfig: 
-    prefix: 'X07MA-FE-SL1:TRYB'
+  deviceConfig:
+    prefix: "X07MA-FE-SL1:TRYB"
   onFailure: raise
   enabled: true
   readoutPriority: baseline
   readOnly: false
   softwareTrigger: false
   deviceTags:
-  - xtreme
-  - frontend
+    - frontend
 
 sl1yt:
-  description: 'slit 1 (frontend) y top'
+  description: "slit 1 (frontend) y top"
   deviceClass: ophyd_devices.EpicsMotorEC
-  deviceConfig: 
-    prefix: 'X07MA-FE-SL1:TRYT'
+  deviceConfig:
+    prefix: "X07MA-FE-SL1:TRYT"
   onFailure: raise
   enabled: true
   readoutPriority: baseline
   readOnly: false
   softwareTrigger: false
   deviceTags:
-  - xtreme
-  - frontend
+    - frontend
 
 sl1xc:
-  description: 'slit 1 (frontend) x center'
+  description: "slit 1 (frontend) x center"
   deviceClass: ophyd_devices.EpicsMotorEC
-  deviceConfig: 
-    prefix: 'X07MA-FE-SL1:CENTERX'
+  deviceConfig:
+    prefix: "X07MA-FE-SL1:CENTERX"
   onFailure: raise
   enabled: true
   readoutPriority: baseline
   readOnly: false
   softwareTrigger: false
   deviceTags:
-  - xtreme
-  - frontend
+    - frontend
 
 sl1xs:
-  description: 'slit 1 (frontend) x size'
+  description: "slit 1 (frontend) x size"
   deviceClass: ophyd_devices.EpicsMotorEC
-  deviceConfig: 
-    prefix: 'X07MA-FE-SL1:SIZEX'
+  deviceConfig:
+    prefix: "X07MA-FE-SL1:SIZEX"
   onFailure: raise
   enabled: true
   readoutPriority: baseline
   readOnly: false
   softwareTrigger: false
   deviceTags:
-  - xtreme
-  - frontend
+    - frontend
 
 sl1yc:
-  description: 'slit 1 (frontend) y center'
+  description: "slit 1 (frontend) y center"
   deviceClass: ophyd_devices.EpicsMotorEC
-  deviceConfig: 
-    prefix: 'X07MA-FE-SL1:CENTERY'
+  deviceConfig:
+    prefix: "X07MA-FE-SL1:CENTERY"
   onFailure: raise
   enabled: true
   readoutPriority: baseline
   readOnly: false
   softwareTrigger: false
   deviceTags:
-  - xtreme
-  - frontend
+    - frontend
 
 sl1ys:
-  description: 'slit 1 (frontend) y size'
+  description: "slit 1 (frontend) y size"
   deviceClass: ophyd_devices.EpicsMotorEC
-  deviceConfig: 
-    prefix: 'X07MA-FE-SL1:SIZEY'
+  deviceConfig:
+    prefix: "X07MA-FE-SL1:SIZEY"
   onFailure: raise
   enabled: true
   readoutPriority: baseline
   readOnly: false
   softwareTrigger: false
   deviceTags:
-  - xtreme
-  - frontend
-
+    - frontend
 
 xbpm1x:
-  description: 'X-ray BPM1 in frontend translation x'
+  description: "X-ray BPM1 in frontend translation x"
   deviceClass: ophyd_devices.EpicsMotorEC
-  deviceConfig: 
-    prefix: 'X07MA-FE-XBPM1:TRX'
+  deviceConfig:
+    prefix: "X07MA-FE-XBPM1:TRX"
   onFailure: raise
   enabled: true
   readoutPriority: baseline
   readOnly: false
   softwareTrigger: false
   deviceTags:
-  - xtreme
-  - frontend
+    - frontend
 
 xbpm1y:
-  description: 'X-ray BPM1 in frontend translation y'
+  description: "X-ray BPM1 in frontend translation y"
   deviceClass: ophyd_devices.EpicsMotorEC
-  deviceConfig: 
-    prefix: 'X07MA-FE-XBPM1:TRY'
+  deviceConfig:
+    prefix: "X07MA-FE-XBPM1:TRY"
   onFailure: raise
   enabled: true
   readoutPriority: baseline
   readOnly: false
   softwareTrigger: false
   deviceTags:
-  - xtreme
-  - frontend
\ No newline at end of file
+    - frontend
diff --git a/xtreme_bec/device_configs/x07ma_base_config.yaml b/xtreme_bec/device_configs/legacy/x07ma_base_config.yaml
similarity index 100%
rename from xtreme_bec/device_configs/x07ma_base_config.yaml
rename to xtreme_bec/device_configs/legacy/x07ma_base_config.yaml
diff --git a/xtreme_bec/device_configs/machine.yaml b/xtreme_bec/device_configs/machine.yaml
index 2e988a4..c6e0a4d 100644
--- a/xtreme_bec/device_configs/machine.yaml
+++ b/xtreme_bec/device_configs/machine.yaml
@@ -13,6 +13,8 @@ curr:
   readoutPriority: monitored
   readOnly: true
   softwareTrigger: false
+  deviceTags:
+    - machine
 
 ofb:
   description: SLS OFB status
@@ -25,6 +27,8 @@ ofb:
   readoutPriority: baseline
   readOnly: true
   softwareTrigger: false
+  deviceTags:
+    - machine
 
 shutter:
   description: X07MA shutter status
@@ -37,6 +41,8 @@ shutter:
   readoutPriority: baseline
   readOnly: true
   softwareTrigger: false
+  deviceTags:
+    - machine
 
 operator:
   description: SLS operator messages
@@ -46,4 +52,6 @@ operator:
   enabled: true
   readoutPriority: on_request
   readOnly: true
-  softwareTrigger: false
\ No newline at end of file
+  softwareTrigger: false
+  deviceTags:
+    - machine
diff --git a/xtreme_bec/device_configs/optics.yaml b/xtreme_bec/device_configs/optics.yaml
index 80c8690..55156f8 100644
--- a/xtreme_bec/device_configs/optics.yaml
+++ b/xtreme_bec/device_configs/optics.yaml
@@ -1,10 +1,220 @@
-mono:
+cmu_rox:
   readoutPriority: baseline
-  description: 'PGM Monochromator'
-  deviceClass: xtreme_bec.devices.PGMMonochromator
+  description: "Collimating mirror rotation x"
+  deviceClass: ophyd_devices.EpicsMotor
   deviceConfig:
-    prefix: 'X07MA-'
+    prefix: "X07MA-OP-CMU:ROX"
   onFailure: retry
   enabled: true
   readOnly: false
-  softwareTrigger: false
\ No newline at end of file
+  softwareTrigger: false
+  deviceTags:
+    - optics
+
+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
+  deviceTags:
+    - optics
+
+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
+  deviceTags:
+    - optics
+
+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
+  deviceTags:
+    - optics
+
+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
+  deviceTags:
+    - optics
+
+mono:
+  readoutPriority: baseline
+  description: "PGM Monochromator"
+  deviceClass: xtreme_bec.devices.PGMMonochromator
+  deviceConfig:
+    prefix: "X07MA-"
+  onFailure: retry
+  enabled: true
+  readOnly: false
+  softwareTrigger: false
+  deviceTags:
+    - optics
+
+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
+  deviceTags:
+    - optics
+
+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
+  deviceTags:
+    - optics
+
+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
+  deviceTags:
+    - optics
+
+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
+  deviceTags:
+    - optics
+
+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
+  deviceTags:
+    - optics
+
+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
+  deviceTags:
+    - optics
+
+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
+  deviceTags:
+    - optics
+
+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
+  deviceTags:
+    - optics
+
+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
+  deviceTags:
+    - optics
+
+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
+  deviceTags:
+    - optics
+
+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
+  deviceTags:
+    - optics
diff --git a/xtreme_bec/devices/uind_mode.py b/xtreme_bec/devices/uind_mode.py
index 75f1e5f..5deaf3f 100644
--- a/xtreme_bec/devices/uind_mode.py
+++ b/xtreme_bec/devices/uind_mode.py
@@ -24,7 +24,7 @@ class UIndMode(Device):
 
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
-        self.value.name = self.name 
+        self.value.name = self.name
 
     def set_mode(
         self,