Index: leahi_dialin/td/modules/ejector.py
===================================================================
diff -u -rdff2704b529bfbb67b2e8c822e69e3df7d955153 -r6caa49d072aceb2655d605de5d2eea52ab1a8911
--- leahi_dialin/td/modules/ejector.py	(.../ejector.py)	(revision dff2704b529bfbb67b2e8c822e69e3df7d955153)
+++ leahi_dialin/td/modules/ejector.py	(.../ejector.py)	(revision 6caa49d072aceb2655d605de5d2eea52ab1a8911)
@@ -50,7 +50,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 @@
         self.handler_execution_times = []
 
 
+
+# ============================================================ Properties ============================================================
+    @property
+    def h5_motor(self) -> dict:
+        """
+        The 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):
         """
@@ -71,19 +86,19 @@
         @return: None
         """
         start = time.perf_counter()
-        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
         self.handler_execution_times.append((timestamp, message, time.perf_counter() - start))
 
 
+
+# ============================================================ 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