Index: leahi_dialin/fp/modules/ro_pump.py
===================================================================
diff -u -r465679409a5fe6f6007ddffca1fd3e89ead9d9c4 -rba415df9f8e76d6b0f21e8f69ba99346e42f7b09
--- leahi_dialin/fp/modules/ro_pump.py	(.../ro_pump.py)	(revision 465679409a5fe6f6007ddffca1fd3e89ead9d9c4)
+++ leahi_dialin/fp/modules/ro_pump.py	(.../ro_pump.py)	(revision ba415df9f8e76d6b0f21e8f69ba99346e42f7b09)
@@ -21,10 +21,10 @@
 from leahi_dialin.common.constants import NO_RESET
 from leahi_dialin.common import fp_enum_repository
 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.protocols.CAN import CanMessenger, CanChannels
-from leahi_dialin.utils.abstract_classes import AbstractSubSystem
+from leahi_dialin.utils.abstract_classes import AbstractSubSystem, LocalVars
 from leahi_dialin.utils.base import publish
 from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray
 
@@ -48,8 +48,6 @@
                                                                        function = self._handler_pump_sync)
 
         self.ro_pump_timestamp = 0.0                            #: The timestamp of the last message
-
-        # The RO Pump data in dictionary format
         self.ro_pump = {
             fp_enum_repository.FPROPumpNames.P12_PUMP.name: {
                 fp_enum_repository.FPPumpAttributes.STATE.name: fp_enum_repository.FPROPumpStates.PUMP_OFF_STATE.value,
@@ -65,6 +63,22 @@
         }
 
 
+
+# ============================================================ Properties ============================================================
+    @property
+    def ro_pump(self) -> dict:
+        """
+        The RO Pump data
+        """
+        return self._ro_pump
+
+    @ro_pump.setter
+    def ro_pump(self, value):
+        self._ro_pump = value
+
+
+
+# ============================================================ Handlers ============================================================
     @publish(["msg_id_fp_ro_pump_data", "ro_pump", "ro_pump_timestamp" ])
     def _handler_pump_sync(self, message, timestamp=0.0):
         """
@@ -74,23 +88,28 @@
         @param message:  published FP ro pump data message
         @return: none
         """
-        sensor_list =[]
-        sensor_list.append((fp_enum_repository.FPROPumpNames.P12_PUMP.name, fp_enum_repository.FPPumpAttributes.STATE.name,                 DataTypes.U32))
-        sensor_list.append((fp_enum_repository.FPROPumpNames.P12_PUMP.name, fp_enum_repository.FPPumpAttributes.DUTY_CYCLE.name,            DataTypes.U32))
-        sensor_list.append((fp_enum_repository.FPROPumpNames.P12_PUMP.name, fp_enum_repository.FPPumpAttributes.FB_DUTY_CYCLE.name,         DataTypes.U32))
-        sensor_list.append((fp_enum_repository.FPROPumpNames.P12_PUMP.name, fp_enum_repository.FPPumpAttributes.SPEED.name,                 DataTypes.F32))
-        sensor_list.append((fp_enum_repository.FPROPumpNames.P12_PUMP.name, fp_enum_repository.FPPumpAttributes.TARGET_PRES.name,           DataTypes.F32))
-        sensor_list.append((fp_enum_repository.FPROPumpNames.P12_PUMP.name, fp_enum_repository.FPPumpAttributes.TARGET_FLOW.name,           DataTypes.F32))
-        sensor_list.append((fp_enum_repository.FPROPumpNames.P12_PUMP.name, fp_enum_repository.FPPumpAttributes.TARGET_DUTY_CYCLE_PCT.name, DataTypes.F32))
-        sensor_list.append((fp_enum_repository.FPROPumpNames.P12_PUMP.name, fp_enum_repository.FPPumpAttributes.DUTY_CYCLE_PCT.name,        DataTypes.F32))
-        sensor_list.append((fp_enum_repository.FPROPumpNames.P12_PUMP.name, fp_enum_repository.FPPumpAttributes.FB_DUTY_CYCLE_PCT.name,     DataTypes.F32))
+        state = LocalVars('state')
 
-        self.process_into_dict(dict_to_update = self.ro_pump,
-                               decoder_list = sensor_list,
-                               message = message)
+        msg_list =[]
+        msg_list.append((state,                                                                                                                         DataTypes.U32))
+        msg_list.append((self.ro_pump, fp_enum_repository.FPROPumpNames.P12_PUMP.name, fp_enum_repository.FPPumpAttributes.DUTY_CYCLE.name,             DataTypes.U32))
+        msg_list.append((self.ro_pump, fp_enum_repository.FPROPumpNames.P12_PUMP.name, fp_enum_repository.FPPumpAttributes.FB_DUTY_CYCLE.name,          DataTypes.U32))
+        msg_list.append((self.ro_pump, fp_enum_repository.FPROPumpNames.P12_PUMP.name, fp_enum_repository.FPPumpAttributes.SPEED.name,                  DataTypes.F32))
+        msg_list.append((self.ro_pump, fp_enum_repository.FPROPumpNames.P12_PUMP.name, fp_enum_repository.FPPumpAttributes.TARGET_PRES.name,            DataTypes.F32))
+        msg_list.append((self.ro_pump, fp_enum_repository.FPROPumpNames.P12_PUMP.name, fp_enum_repository.FPPumpAttributes.TARGET_FLOW.name,            DataTypes.F32))
+        msg_list.append((self.ro_pump, fp_enum_repository.FPROPumpNames.P12_PUMP.name, fp_enum_repository.FPPumpAttributes.TARGET_DUTY_CYCLE_PCT.name,  DataTypes.F32))
+        msg_list.append((self.ro_pump, fp_enum_repository.FPROPumpNames.P12_PUMP.name, fp_enum_repository.FPPumpAttributes.DUTY_CYCLE_PCT.name,         DataTypes.F32))
+        msg_list.append((self.ro_pump, fp_enum_repository.FPROPumpNames.P12_PUMP.name, fp_enum_repository.FPPumpAttributes.FB_DUTY_CYCLE_PCT.name,      DataTypes.F32))
+
+        self.process_into_vars(decoder_list = msg_list, message = message)
+
+        # Convert the state to enum
+        self.ro_pump[fp_enum_repository.FPROPumpNames.P12_PUMP.name][fp_enum_repository.FPPumpAttributes.STATE.name] = fp_enum_repository.FPROPumpStates(state.value)
         self.ro_pump_timestamp = timestamp
 
 
+
+# ============================================================ Overrides and Requests ============================================================
     def cmd_ro_pump_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
         """
         Constructs and sends the FP RO pump broadcast interval override command