Index: leahi_dialin/td/modules/air_pump.py
===================================================================
diff -u -r3c2bc6419b5796c03a7e4943938055c4ac36c24b -r6caa49d072aceb2655d605de5d2eea52ab1a8911
--- leahi_dialin/td/modules/air_pump.py	(.../air_pump.py)	(revision 3c2bc6419b5796c03a7e4943938055c4ac36c24b)
+++ leahi_dialin/td/modules/air_pump.py	(.../air_pump.py)	(revision 6caa49d072aceb2655d605de5d2eea52ab1a8911)
@@ -50,7 +50,6 @@
 
         self.td_air_pump_timestamp = 0.0                        #: The timestamp of the last message
 
-        #: The Air Trap Level Sensors data in dictionary format
         self.td_air_pump = {
             td_enum_repository.TDAirPumpNames.H12_AIR_PUMP.name: {
                 td_enum_repository.TDAirPumpAttributes.STATE.name: 0,
@@ -65,6 +64,22 @@
         self.handler_execution_times = []
 
 
+
+# ============================================================ Properties ============================================================
+    @property
+    def td_air_pump(self) -> dict:
+        """
+        The Air Pump data
+        """
+        return self._td_air_pump
+
+    @td_air_pump.setter
+    def td_air_pump(self, value):
+        self._td_air_pump = value
+
+
+
+# ============================================================ Handlers ============================================================
     @publish(["msg_id_td_air_pump_data", "td_air_pump", "td_air_pump_timestamp"])
     def _handler_air_pump_sync(self, message, timestamp=0.0):
         """
@@ -74,22 +89,21 @@
         @return: None
         """
         start = time.perf_counter()
-        sensor_list =[]
-        sensor_list.append((td_enum_repository.TDAirPumpNames.H12_AIR_PUMP.name, td_enum_repository.TDAirPumpAttributes.STATE.name,         DataTypes.U32))
-        sensor_list.append((td_enum_repository.TDAirPumpNames.H12_AIR_PUMP.name, td_enum_repository.TDAirPumpAttributes.DUTY_CYCLE.name,    DataTypes.F32))
-        sensor_list.append((td_enum_repository.TDAirPumpNames.H12_AIR_PUMP.name, td_enum_repository.TDAirPumpAttributes.RPM.name,           DataTypes.U32))
+        msg_list =[]
+        msg_list.append((self.td_air_pump, td_enum_repository.TDAirPumpNames.H12_AIR_PUMP.name, td_enum_repository.TDAirPumpAttributes.STATE.name,          DataTypes.U32))
+        msg_list.append((self.td_air_pump, td_enum_repository.TDAirPumpNames.H12_AIR_PUMP.name, td_enum_repository.TDAirPumpAttributes.DUTY_CYCLE.name,     DataTypes.F32))
+        msg_list.append((self.td_air_pump, td_enum_repository.TDAirPumpNames.H12_AIR_PUMP.name, td_enum_repository.TDAirPumpAttributes.RPM.name,            DataTypes.U32))
         # TODO remove after FPGA air pump speed validation
-        sensor_list.append((td_enum_repository.TDAirPumpNames.H12_AIR_PUMP.name, td_enum_repository.TDAirPumpAttributes.FPGA_RPM.name,      DataTypes.U32))
-        # TODO remove after FPGA air pump speed validation
-        sensor_list.append((td_enum_repository.TDAirPumpNames.H12_AIR_PUMP.name, td_enum_repository.TDAirPumpAttributes.SCALAR_POWER.name,  DataTypes.U32))
+        msg_list.append((self.td_air_pump, td_enum_repository.TDAirPumpNames.H12_AIR_PUMP.name, td_enum_repository.TDAirPumpAttributes.FPGA_RPM.name,       DataTypes.U32))
+        msg_list.append((self.td_air_pump, td_enum_repository.TDAirPumpNames.H12_AIR_PUMP.name, td_enum_repository.TDAirPumpAttributes.SCALAR_POWER.name,   DataTypes.U32))
         
-        self.process_into_dict(dict_to_update = self.td_air_pump,
-                               decoder_list = sensor_list,
-                               message = message)
+        self.process_into_vars(decoder_list = msg_list, message = message)
         self.td_air_pump_timestamp = timestamp
         self.handler_execution_times.append((timestamp, message, time.perf_counter() - start))
 
 
+
+# ============================================================ Overrides and Requests ============================================================
     def cmd_air_pump_data_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
         """
         Constructs and sends the air pump data broadcast interval override command