Index: leahi_dialin/td/modules/blood_flow.py
===================================================================
diff -u -rd4692c944b4b54a9bfd1b2ad178a37de854806ff -r3f4937e339925dde0b95f08e49969f8983c5cba4
--- leahi_dialin/td/modules/blood_flow.py	(.../blood_flow.py)	(revision d4692c944b4b54a9bfd1b2ad178a37de854806ff)
+++ leahi_dialin/td/modules/blood_flow.py	(.../blood_flow.py)	(revision 3f4937e339925dde0b95f08e49969f8983c5cba4)
@@ -20,7 +20,7 @@
 # Project imports
 from leahi_dialin.common.constants import NO_RESET, PUMP_CONTROL_MODE_CLOSED_LOOP
 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
@@ -49,7 +49,6 @@
 
         self.td_blood_flow_timestamp = 0.0                      #: The timestamp of the last message
 
-        #: The TD Blood Flow data in dictionary format
         self.h4_motor = {
             td_enum_repository.TDBloodFlowMotorAttributes.SET_BLOOD_FLOW_RATE.name: 0,
             td_enum_repository.TDBloodFlowMotorAttributes.MEASURED_BLOOD_FLOW_RATE.name: 0.0,
@@ -64,6 +63,21 @@
 
 
 
+# ============================================================ Properties ============================================================
+    @property
+    def h4_motor(self) -> dict:
+        """
+        The current Blood Flow data
+        """
+        return self._h4_motor
+
+    @h4_motor.setter
+    def h4_motor(self, value):
+        self._h4_motor = value
+
+
+
+# ============================================================ Handlers ============================================================
     @publish(["msg_id_td_blood_pump_data", "h4_motor", "td_blood_flow_timestamp"])
     def _handler_blood_flow_sync(self, message, timestamp=0.0):
         """
@@ -73,23 +87,23 @@
         @param message:  published blood flow data message
         @return: none
         """
-        sensor_list =[]
-        sensor_list.append((td_enum_repository.TDBloodFlowMotorAttributes.SET_BLOOD_FLOW_RATE.name,             DataTypes.S32))
-        sensor_list.append((td_enum_repository.TDBloodFlowMotorAttributes.MEASURED_BLOOD_FLOW_RATE.name,        DataTypes.F32))
-        sensor_list.append((td_enum_repository.TDBloodFlowMotorAttributes.MEASURED_BLOOD_PUMP_ROTOR_SPEED.name, DataTypes.F32))
-        sensor_list.append((td_enum_repository.TDBloodFlowMotorAttributes.MEASURED_BLOOD_PUMP_SPEED.name,       DataTypes.F32))
-        sensor_list.append((td_enum_repository.TDBloodFlowMotorAttributes.MEASURED_BLOOD_PUMP_TORQUE.name,      DataTypes.F32))
-        sensor_list.append((td_enum_repository.TDBloodFlowMotorAttributes.SET_RPM.name,                         DataTypes.F32))
-        sensor_list.append((td_enum_repository.TDBloodFlowMotorAttributes.ROTOR_COUNT.name,                     DataTypes.U32))
-        sensor_list.append((td_enum_repository.TDBloodFlowMotorAttributes.PRES_BLOOD_FLOW_RATE.name,            DataTypes.U32))
-        sensor_list.append((td_enum_repository.TDBloodFlowMotorAttributes.ROTOR_HALL_STATE.name,                DataTypes.U32))
+        msg_list =[]
+        msg_list.append((self.h4_motor, td_enum_repository.TDBloodFlowMotorAttributes.SET_BLOOD_FLOW_RATE.name,             DataTypes.S32))
+        msg_list.append((self.h4_motor, td_enum_repository.TDBloodFlowMotorAttributes.MEASURED_BLOOD_FLOW_RATE.name,        DataTypes.F32))
+        msg_list.append((self.h4_motor, td_enum_repository.TDBloodFlowMotorAttributes.MEASURED_BLOOD_PUMP_ROTOR_SPEED.name, DataTypes.F32))
+        msg_list.append((self.h4_motor, td_enum_repository.TDBloodFlowMotorAttributes.MEASURED_BLOOD_PUMP_SPEED.name,       DataTypes.F32))
+        msg_list.append((self.h4_motor, td_enum_repository.TDBloodFlowMotorAttributes.MEASURED_BLOOD_PUMP_TORQUE.name,      DataTypes.F32))
+        msg_list.append((self.h4_motor, td_enum_repository.TDBloodFlowMotorAttributes.SET_RPM.name,                         DataTypes.F32))
+        msg_list.append((self.h4_motor, td_enum_repository.TDBloodFlowMotorAttributes.ROTOR_COUNT.name,                     DataTypes.U32))
+        msg_list.append((self.h4_motor, td_enum_repository.TDBloodFlowMotorAttributes.PRES_BLOOD_FLOW_RATE.name,            DataTypes.U32))
+        msg_list.append((self.h4_motor, td_enum_repository.TDBloodFlowMotorAttributes.ROTOR_HALL_STATE.name,                DataTypes.U32))
 
-        self.process_into_dict(dict_to_update = self.h4_motor,
-                               decoder_list = sensor_list,
-                               message = message)
+        self.process_into_vars(decoder_list = msg_list, message = message)
         self.td_blood_flow_timestamp = timestamp
 
 
+
+# ============================================================ Overrides and Requests ============================================================
     def cmd_blood_flow_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
         """
         Constructs and sends the measured blood flow broadcast interval override command