Index: leahi_dialin/fp/modules/conductivity_sensors.py
===================================================================
diff -u -r6ce1aaaa1c5ce4ef44d51d7c805c81e34cdb2499 -rba415df9f8e76d6b0f21e8f69ba99346e42f7b09
--- leahi_dialin/fp/modules/conductivity_sensors.py	(.../conductivity_sensors.py)	(revision 6ce1aaaa1c5ce4ef44d51d7c805c81e34cdb2499)
+++ leahi_dialin/fp/modules/conductivity_sensors.py	(.../conductivity_sensors.py)	(revision ba415df9f8e76d6b0f21e8f69ba99346e42f7b09)
@@ -22,7 +22,7 @@
 from leahi_dialin.common import fp_enum_repository, dd_enum_repository
 from leahi_dialin.common.fp_defs import BETA_IOFP_COND_SENSOR_OFFSET
 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
@@ -54,11 +54,7 @@
                                                                        function = self._handler_ro_rejection_ratio_sync)
             
         self.fp_conductivity_timestamp = 0.0                    #: The timestamp of the last Conductivity data message
-        self.ro_rejection_ratio_timestamp = 0.0                 #: The timestamp of the last RO Rejection Ratio data message
-
-        #: The Conductivity Sensors data in dictionary format
         self.fp_conductivity = {
-
             fp_enum_repository.FPConductivitySensorNames.P9_COND.name: {
                 dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY.name: 0.0,
                 dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY_RESISTANCE.name: 0.0,
@@ -73,7 +69,7 @@
             },
         }
 
-        #: The RO Rejection Ratio data in dictionary format
+        self.ro_rejection_ratio_timestamp = 0.0                 #: The timestamp of the last RO Rejection Ratio data message
         self.ro_rejection_ratio = {
             fp_enum_repository.FPRORejectionRatioNames.RAW_RO_REJECTION_RATIO.name: 0.0,
             fp_enum_repository.FPRORejectionRatioNames.RAW_RO_REJECTION_RATIO_TANK_FILL.name: 0.0,
@@ -83,6 +79,35 @@
         }
 
 
+
+
+# ============================================================ Properties ============================================================
+    @property
+    def fp_conductivity(self) -> dict:
+        """
+        The Conductivity data
+        """
+        return self._conductivity
+
+    @fp_conductivity.setter
+    def fp_conductivity(self, value):
+        self._conductivity = value
+
+
+    @property
+    def ro_rejection_ratio(self) -> dict:
+        """
+        The current RO Rejection Ratio data
+        """
+        return self._ro_rejection_ratio
+
+    @ro_rejection_ratio.setter
+    def ro_rejection_ratio(self, value):
+        self._ro_rejection_ratio = value
+
+
+
+# ============================================================ Handlers ============================================================
     @publish(["msg_id_fp_conductivity_data", "fp_conductivity", "fp_conductivity_timestamp"])
     def _handler_conductivity_sensors_sync(self, message, timestamp=0.0):
         """
@@ -92,19 +117,17 @@
         @param message:  published conductivity sensor data message
         @return: None
         """
-        sensor_list =[]
-        sensor_list.append((fp_enum_repository.FPConductivitySensorNames.P9_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY.name, DataTypes.F32))
-        sensor_list.append((fp_enum_repository.FPConductivitySensorNames.P18_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY.name, DataTypes.F32))
-        sensor_list.append((fp_enum_repository.FPConductivitySensorNames.P9_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY_RESISTANCE.name, DataTypes.F32))
-        sensor_list.append((fp_enum_repository.FPConductivitySensorNames.P18_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY_RESISTANCE.name, DataTypes.F32))
-        sensor_list.append((fp_enum_repository.FPConductivitySensorNames.P9_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.RTD_RESISTANCE.name, DataTypes.F32))
-        sensor_list.append((fp_enum_repository.FPConductivitySensorNames.P18_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.RTD_RESISTANCE.name, DataTypes.F32))
-        sensor_list.append((fp_enum_repository.FPConductivitySensorNames.P9_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.UNCOMPENSATED_COND.name, DataTypes.F32))
-        sensor_list.append((fp_enum_repository.FPConductivitySensorNames.P18_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.UNCOMPENSATED_COND.name, DataTypes.F32))
+        msg_list =[]
+        msg_list.append((self.fp_conductivity, fp_enum_repository.FPConductivitySensorNames.P9_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY.name,              DataTypes.F32))
+        msg_list.append((self.fp_conductivity, fp_enum_repository.FPConductivitySensorNames.P18_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY.name,             DataTypes.F32))
+        msg_list.append((self.fp_conductivity, fp_enum_repository.FPConductivitySensorNames.P9_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY_RESISTANCE.name,   DataTypes.F32))
+        msg_list.append((self.fp_conductivity, fp_enum_repository.FPConductivitySensorNames.P18_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.CONDUCTIVITY_RESISTANCE.name,  DataTypes.F32))
+        msg_list.append((self.fp_conductivity, fp_enum_repository.FPConductivitySensorNames.P9_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.RTD_RESISTANCE.name,            DataTypes.F32))
+        msg_list.append((self.fp_conductivity, fp_enum_repository.FPConductivitySensorNames.P18_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.RTD_RESISTANCE.name,           DataTypes.F32))
+        msg_list.append((self.fp_conductivity, fp_enum_repository.FPConductivitySensorNames.P9_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.UNCOMPENSATED_COND.name,        DataTypes.F32))
+        msg_list.append((self.fp_conductivity, fp_enum_repository.FPConductivitySensorNames.P18_COND.name, dd_enum_repository.DDConductivityResistanceAttributes.UNCOMPENSATED_COND.name,       DataTypes.F32))
 
-        self.process_into_dict(dict_to_update = self.fp_conductivity,
-                               decoder_list = sensor_list,
-                               message = message)
+        self.process_into_vars(decoder_list = msg_list, message = message)
         self.fp_conductivity_timestamp = timestamp
 
 
@@ -117,19 +140,19 @@
         @param message: Published RO Rejection Ratio data message
         @return: None
         """
-        sensor_list =[]
-        sensor_list.append((fp_enum_repository.FPRORejectionRatioNames.RAW_RO_REJECTION_RATIO.name,             DataTypes.F32))
-        sensor_list.append((fp_enum_repository.FPRORejectionRatioNames.RAW_RO_REJECTION_RATIO_TANK_FILL.name,   DataTypes.F32))
-        sensor_list.append((fp_enum_repository.FPRORejectionRatioNames.AVG_RO_REJECTION_RATIO.name,             DataTypes.F32))
-        sensor_list.append((fp_enum_repository.FPRORejectionRatioNames.AVG_RO_REJECTION_RATIO_TANK_FILL.name,   DataTypes.F32))
-        sensor_list.append((fp_enum_repository.FPRORejectionRatioNames.GEN_PERMEATE_STATE.name,                 DataTypes.U32))
+        msg_list =[]
+        msg_list.append((self.ro_rejection_ratio, fp_enum_repository.FPRORejectionRatioNames.RAW_RO_REJECTION_RATIO.name,           DataTypes.F32))
+        msg_list.append((self.ro_rejection_ratio, fp_enum_repository.FPRORejectionRatioNames.RAW_RO_REJECTION_RATIO_TANK_FILL.name, DataTypes.F32))
+        msg_list.append((self.ro_rejection_ratio, fp_enum_repository.FPRORejectionRatioNames.AVG_RO_REJECTION_RATIO.name,           DataTypes.F32))
+        msg_list.append((self.ro_rejection_ratio, fp_enum_repository.FPRORejectionRatioNames.AVG_RO_REJECTION_RATIO_TANK_FILL.name, DataTypes.F32))
+        msg_list.append((self.ro_rejection_ratio, fp_enum_repository.FPRORejectionRatioNames.GEN_PERMEATE_STATE.name,               DataTypes.U32))
 
-        self.process_into_dict(dict_to_update = self.ro_rejection_ratio,
-                               decoder_list = sensor_list,
-                               message = message)
+        self.process_into_vars(decoder_list = msg_list, message = message)
         self.ro_rejection_ratio_timestamp = timestamp
 
 
+
+# ============================================================ Overrides and Requests ============================================================
     def cmd_conductivity_sensor_data_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
         """
         Constructs and sends the FP conductivity sensor data broadcast interval override command