Index: leahi_dialin/td/modules/air_pump.py
===================================================================
diff -u -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 -r3f4937e339925dde0b95f08e49969f8983c5cba4
--- leahi_dialin/td/modules/air_pump.py	(.../air_pump.py)	(revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6)
+++ leahi_dialin/td/modules/air_pump.py	(.../air_pump.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
@@ -52,7 +52,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,
@@ -66,6 +65,22 @@
         }
 
 
+
+# ============================================================ Properties ============================================================
+    @property
+    def td_air_pump(self) -> dict:
+        """
+        The current 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,21 +89,20 @@
         @param message:  published air pump data message as: air pump state
         @return: None
         """
-        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
 
 
+
+# ============================================================ 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