Index: leahi_dialin/td/modules/bubble_detector.py
===================================================================
diff -u -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 -r3f4937e339925dde0b95f08e49969f8983c5cba4
--- leahi_dialin/td/modules/bubble_detector.py	(.../bubble_detector.py)	(revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6)
+++ leahi_dialin/td/modules/bubble_detector.py	(.../bubble_detector.py)	(revision 3f4937e339925dde0b95f08e49969f8983c5cba4)
@@ -20,7 +20,7 @@
 # Project imports
 from leahi_dialin.common.constants import NO_RESET
 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
@@ -61,7 +61,6 @@
 
         self.td_air_bubbles_timestamp = 0.0                     #: The timestamp of the last message
 
-        #: The TD Bubble Detector data in dictionary format
         self.h18_bubble_detector = {
             td_enum_repository.TDAirBubbleDetectorNames.H18_ADV.name: {
                 # Initialize status of ADV air bubble detectors to fluid (no air bubble) detected
@@ -72,6 +71,22 @@
         }
 
 
+
+# ============================================================ Properties ============================================================
+    @property
+    def h18_bubble_detector(self) -> dict:
+        """
+        The current Bubble Detector data
+        """
+        return self._h18_bubble_detector
+
+    @h18_bubble_detector.setter
+    def h18_bubble_detector(self, value):
+        self._h18_bubble_detector = value
+
+
+
+# ============================================================ Handlers ============================================================
     @publish(["msg_id_td_bubbles_data", "h18_bubble_detector", "td_air_bubbles_timestamp"])
     def _handler_air_bubbles_data_sync(self, message, timestamp=0.0):
         """
@@ -80,16 +95,16 @@
         @param message:  published air bubbles data message as: h18 bubble status, h18 bubble state
         @return: None
         """
-        sensor_list =[]
-        sensor_list.append((td_enum_repository.TDAirBubbleDetectorNames.H18_ADV.name, td_enum_repository.TDAirBubbleDetectorAttributes.STATUS.name, DataTypes.U32))
-        sensor_list.append((td_enum_repository.TDAirBubbleDetectorNames.H18_ADV.name, td_enum_repository.TDAirBubbleDetectorAttributes.STATE.name,  DataTypes.U32))
+        msg_list =[]
+        msg_list.append((self.h18_bubble_detector, td_enum_repository.TDAirBubbleDetectorNames.H18_ADV.name, td_enum_repository.TDAirBubbleDetectorAttributes.STATUS.name, DataTypes.U32))
+        msg_list.append((self.h18_bubble_detector, td_enum_repository.TDAirBubbleDetectorNames.H18_ADV.name, td_enum_repository.TDAirBubbleDetectorAttributes.STATE.name,  DataTypes.U32))
 
-        self.process_into_dict(dict_to_update = self.h18_bubble_detector,
-                               decoder_list = sensor_list,
-                               message = message)
+        self.process_into_vars(decoder_list = msg_list, message = message)
         self.td_air_bubbles_timestamp = timestamp
 
 
+
+# ============================================================ Overrides and Requests ============================================================
     def cmd_air_bubbles_data_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
         """
         Constructs and sends the air bubbles data broadcast interval override command