Index: leahi_dialin/td/modules/ejector.py
===================================================================
diff -u -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 -r3f4937e339925dde0b95f08e49969f8983c5cba4
--- leahi_dialin/td/modules/ejector.py	(.../ejector.py)	(revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6)
+++ leahi_dialin/td/modules/ejector.py	(.../ejector.py)	(revision 3f4937e339925dde0b95f08e49969f8983c5cba4)
@@ -20,7 +20,7 @@
 # Project imports
 from leahi_dialin.common.constants import NO_RESET
 from leahi_dialin.common.generic_defs import DataTypes
-from leahi_dialin.common.msg_defs import MsgIds
+from leahi_dialin.common.msg_ids import MsgIds
 from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override
 from leahi_dialin.common import td_enum_repository
 from leahi_dialin.protocols.CAN import CanMessenger, CanChannels
@@ -51,7 +51,6 @@
 
         self.td_ejector_timestamp = 0           #: The timestamp of the last message
 
-        #: The TD Ejector data in dictionary format
         self.h5_motor = {
             td_enum_repository.TDEjectorNames.H5_MOTOR.name: {
                 td_enum_repository.TDEjectorAttributes.STATE.name: td_enum_repository.TDEjectorStates.EJECTOR_STATE_INIT.value,
@@ -62,6 +61,22 @@
         }
 
 
+
+# ============================================================ Properties ============================================================
+    @property
+    def h5_motor(self) -> dict:
+        """
+        The current Ejector data
+        """
+        return self._h5_motor
+
+    @h5_motor.setter
+    def h5_motor(self, value):
+        self._h5_motor = value
+
+
+
+# ============================================================ Handlers ============================================================
     @publish(["msg_id_td_ejector_data", "h5_motor", "td_ejector_timestamp"])
     def _handler_ejector_sync(self, message, timestamp=0.0):
         """
@@ -70,18 +85,18 @@
         @param message:  published ejector data message as: ejector state
         @return: None
         """
-        sensor_list =[]
-        sensor_list.append((td_enum_repository.TDEjectorNames.H5_MOTOR.name, td_enum_repository.TDEjectorAttributes.STATE.name,             DataTypes.U32))
-        sensor_list.append((td_enum_repository.TDEjectorNames.H5_MOTOR.name, td_enum_repository.TDEjectorAttributes.SET_SPEED.name,         DataTypes.F32))
-        sensor_list.append((td_enum_repository.TDEjectorNames.H5_MOTOR.name, td_enum_repository.TDEjectorAttributes.OPT_SNSR_RETRACT.name,  DataTypes.U32))
-        sensor_list.append((td_enum_repository.TDEjectorNames.H5_MOTOR.name, td_enum_repository.TDEjectorAttributes.OPT_SNSR_ENGAGE.name,   DataTypes.U32))
+        msg_list =[]
+        msg_list.append((self.h5_motor, td_enum_repository.TDEjectorNames.H5_MOTOR.name, td_enum_repository.TDEjectorAttributes.STATE.name,             DataTypes.U32))
+        msg_list.append((self.h5_motor, td_enum_repository.TDEjectorNames.H5_MOTOR.name, td_enum_repository.TDEjectorAttributes.SET_SPEED.name,         DataTypes.F32))
+        msg_list.append((self.h5_motor, td_enum_repository.TDEjectorNames.H5_MOTOR.name, td_enum_repository.TDEjectorAttributes.OPT_SNSR_RETRACT.name,  DataTypes.U32))
+        msg_list.append((self.h5_motor, td_enum_repository.TDEjectorNames.H5_MOTOR.name, td_enum_repository.TDEjectorAttributes.OPT_SNSR_ENGAGE.name,   DataTypes.U32))
 
-        self.process_into_dict(dict_to_update = self.h5_motor,
-                               decoder_list = sensor_list,
-                               message = message)
+        self.process_into_vars(decoder_list = msg_list, message = message)
         self.td_ejector_timestamp = timestamp
 
 
+
+# ============================================================ Overrides and Requests ============================================================
     def cmd_ejector_data_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
         """
         Constructs and sends the ejector motor data broadcast interval override command