Index: leahi_dialin/td/modules/air_pump.py
===================================================================
diff -u -r7f463d8649e41b995e1a94cc001ffc50541cafb7 -re7d16bd6881619e5fc2a0bc1a7fd578a9978498e
--- leahi_dialin/td/modules/air_pump.py	(.../air_pump.py)	(revision 7f463d8649e41b995e1a94cc001ffc50541cafb7)
+++ leahi_dialin/td/modules/air_pump.py	(.../air_pump.py)	(revision e7d16bd6881619e5fc2a0bc1a7fd578a9978498e)
@@ -19,6 +19,7 @@
 
 from .constants import RESET, NO_RESET
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
+from leahi_dialin.common.td_defs import TDAirPumpNames, TDAirPumpAttributes
 from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels
 from leahi_dialin.utils.base import AbstractSubSystem, publish
 from leahi_dialin.utils.checks import check_broadcast_interval_override_ms
@@ -47,11 +48,16 @@
             self.can_interface.register_receiving_publication_function(channel_id, msg_id,
                                                                        self._handler_air_pump_sync)
 
-        self.h12_air_pump_state = 0
-        self.h12_air_pump_power = 0
+        self.td_air_pump = {
+            TDAirPumpNames.H12_AIR_PUMP.name: {
+                TDAirPumpAttributes.STATE.name: 0,
+                TDAirPumpAttributes.POWER.name: 0
+            }
+        }
+
         self.td_air_pump_timestamp = 0.0
 
-    @publish(["td_air_pump_timestamp", "h12_air_pump_state","h12_air_pump_power"])
+    @publish(["td_air_pump_timestamp", "td_air_pump"])
     def _handler_air_pump_sync(self, message, timestamp=0.0):
         """
         Handles published air pump data messages.
@@ -64,8 +70,8 @@
         app = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))
 
-        self.h12_air_pump_state = aps[0]
-        self.h12_air_pump_power = app[0]
+        self.td_air_pump[TDAirPumpNames.H12_AIR_PUMP.name][TDAirPumpAttributes.STATE.name] = aps[0]
+        self.td_air_pump[TDAirPumpNames.H12_AIR_PUMP.name][TDAirPumpAttributes.POWER.name] = app[0]
         self.td_air_pump_timestamp = timestamp
 
     def cmd_air_pump_set_state(self, state: int, power: int) -> int: