Index: leahi_dialin/dd/modules/piston_pump.py
===================================================================
diff -u -rfe37f0a0f2c683696f41f6a349cf2756ed09d5d7 -rd9c41496bfba02f66b6b38a8ecae8c017f160235
--- leahi_dialin/dd/modules/piston_pump.py	(.../piston_pump.py)	(revision fe37f0a0f2c683696f41f6a349cf2756ed09d5d7)
+++ leahi_dialin/dd/modules/piston_pump.py	(.../piston_pump.py)	(revision d9c41496bfba02f66b6b38a8ecae8c017f160235)
@@ -19,17 +19,12 @@
 
 from .constants import RESET, NO_RESET
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
+from leahi_dialin.common.dd_defs import DDPistonPumpsEnum, DDPistonPumpAttributesEnum
 from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels
 from leahi_dialin.utils.base import AbstractSubSystem, publish, DialinEnum
 from leahi_dialin.utils.checks import check_broadcast_interval_override_ms
 from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray
 
-@unique
-class DDPistonPumpsEnum(DialinEnum):
-    ACID = 0                        # Acid piston pump
-    BICARB = 1                      # Bicarbonate piston pump
-    UF = 2                          # Ultrafilteration piston pump
-    NUM_OF_PISTON_PUMPS = 3         # Number of piston pumps
 
 class DDPistonPumps(AbstractSubSystem):
     """
@@ -54,21 +49,28 @@
             self.can_interface.register_receiving_publication_function(channel_id, msg_id,
                                                                        self._handler_piston_pumps_sync)
 
+        self.dd_piston_pumps = {
+            DDPistonPumpsEnum.ACID.name: {
+                DDPistonPumpAttributesEnum.CONTROL_STATE.name: 0,
+                DDPistonPumpAttributesEnum.SW_COUNTER.name: 0,
+                DDPistonPumpAttributesEnum.CYCLE_COUNTER.name: 0
+            },
+            DDPistonPumpsEnum.BICARB.name: {
+                DDPistonPumpAttributesEnum.CONTROL_STATE.name: 0,
+                DDPistonPumpAttributesEnum.SW_COUNTER.name: 0,
+                DDPistonPumpAttributesEnum.CYCLE_COUNTER.name: 0
+            },
+            DDPistonPumpsEnum.UF.name: {
+                DDPistonPumpAttributesEnum.CONTROL_STATE.name: 0,
+                DDPistonPumpAttributesEnum.SW_COUNTER.name: 0,
+                DDPistonPumpAttributesEnum.CYCLE_COUNTER.name: 0
+            }
+        }
+
         self.dd_piston_pump_timestamp = 0.0
-        self.acid_control_state = 0
-        self.bicarb_control_state = 0
-        self.uf_control_state = 0
-        self.acid_sw_counter = 0
-        self.bicarb_sw_counter = 0
-        self.uf_sw_counter = 0
-        self.acid_cycle_counter = 0
-        self.bicarb_cycle_counter = 0
-        self.uf_cycle_counter = 0
 
-    @publish(["dd_piston_pump_timestamp",
-              "acid_control_state", "bicarb_control_state", "uf_control_state",
-              "acid_sw_counter", "bicarb_sw_counter", "uf_sw_counter",
-              "acid_cycle_counter", "bicarb_cycle_counter", "uf_cycle_counter"])
+
+    @publish(["dd_piston_pump_timestamp", "dd_piston_pumps"])
     def _handler_piston_pumps_sync(self, message, timestamp=0.0):
         """
         Handles published piston pumps' data messages. Piston pumps' data are captured
@@ -77,24 +79,24 @@
         @param message:  published piston pumps' data message
         @return: None
         """
-        self.acid_control_state = struct.unpack('i', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0]
-        self.bicarb_control_state = struct.unpack('i', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0]
-        self.uf_control_state = struct.unpack('i', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0]
-        self.acid_sw_counter = struct.unpack('i', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0]
-        self.bicarb_sw_counter = struct.unpack('i', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0]
-        self.uf_sw_counter = struct.unpack('i', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0]
-        self.acid_cycle_counter = struct.unpack('i', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))[0]
-        self.bicarb_cycle_counter = struct.unpack('i', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))[0]
-        self.uf_cycle_counter = struct.unpack('i', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))[0]
+        self.dd_piston_pumps[DDPistonPumpsEnum.ACID.name][DDPistonPumpAttributesEnum.CONTROL_STATE.name] = (
+            struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])))[0]
+        self.dd_piston_pumps[DDPistonPumpsEnum.BICARB.name][DDPistonPumpAttributesEnum.CONTROL_STATE.name] = (
+            struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2])))[0]
+        self.dd_piston_pumps[DDPistonPumpsEnum.UF.name][DDPistonPumpAttributesEnum.CONTROL_STATE.name] = (
+            struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3])))[0]
+        self.dd_piston_pumps[DDPistonPumpsEnum.ACID.name][DDPistonPumpAttributesEnum.SW_COUNTER.name] = (
+            struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4])))[0]
+        self.dd_piston_pumps[DDPistonPumpsEnum.BICARB.name][DDPistonPumpAttributesEnum.SW_COUNTER.name] = (
+            struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5])))[0]
+        self.dd_piston_pumps[DDPistonPumpsEnum.UF.name][DDPistonPumpAttributesEnum.SW_COUNTER.name] = (
+            struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6])))[0]
+        self.dd_piston_pumps[DDPistonPumpsEnum.ACID.name][DDPistonPumpAttributesEnum.CYCLE_COUNTER.name] = (
+            struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7])))[0]
+        self.dd_piston_pumps[DDPistonPumpsEnum.BICARB.name][DDPistonPumpAttributesEnum.CYCLE_COUNTER.name] = (
+            struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8])))[0]
+        self.dd_piston_pumps[DDPistonPumpsEnum.UF.name][DDPistonPumpAttributesEnum.CYCLE_COUNTER.name] = (
+            struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9])))[0]
         self.dd_piston_pump_timestamp = timestamp
 
 
Index: leahi_dialin/fp/modules/levels.py
===================================================================
diff -u -r9ac39d94327325e5b882318bc0e5126668eec66e -rd9c41496bfba02f66b6b38a8ecae8c017f160235
--- leahi_dialin/fp/modules/levels.py	(.../levels.py)	(revision 9ac39d94327325e5b882318bc0e5126668eec66e)
+++ leahi_dialin/fp/modules/levels.py	(.../levels.py)	(revision d9c41496bfba02f66b6b38a8ecae8c017f160235)
@@ -20,6 +20,7 @@
 
 from .constants import NO_RESET
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
+from leahi_dialin.common.fp_defs import FPFloaterLevels, FPFloaterLevelSensorNames
 from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels
 from leahi_dialin.utils.base import AbstractSubSystem, publish, DialinEnum
 from leahi_dialin.utils.checks import check_broadcast_interval_override_ms
@@ -48,19 +49,21 @@
             msg_id = MsgIds.MSG_ID_FP_LEVEL_DATA.value
             self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_levels_sync)
 
-        self.p25_level = 0
+        self.fp_levels = {
+            FPFloaterLevelSensorNames.P25_LEVEL.name: 0
+        }
         self.fp_levels_timestamp = 0
 
     @publish(["fp_levels_timestamp",
-                "p25_level",])
+                "fp_levels",])
     def _handler_levels_sync(self, message, timestamp=0.0):
         """
         Handles published levels message
 
         @param message:  published levels data message
         @returns none
         """
-        self.p25_level = struct.unpack('i', bytearray(
+        self.fp_levels[FPFloaterLevelSensorNames.P25_LEVEL.name] = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0]
 
         self.fp_levels_timestamp = timestamp