Index: leahi_dialin/td/modules/bubble_detector.py
===================================================================
diff -u -r20c821bd230fc7689a0275a2918981669ff5cc19 -re45b20cdc5d4c5dcff8cef530b173ca94cb2e422
--- leahi_dialin/td/modules/bubble_detector.py	(.../bubble_detector.py)	(revision 20c821bd230fc7689a0275a2918981669ff5cc19)
+++ leahi_dialin/td/modules/bubble_detector.py	(.../bubble_detector.py)	(revision e45b20cdc5d4c5dcff8cef530b173ca94cb2e422)
@@ -8,21 +8,24 @@
 # @file    air_bubbles.py
 #
 # @author  (last)      Zoltan Miskolci
-# @date    (last)      09-Jan-2026
+# @date    (last)      05-May-2026
 # @author  (original)  Peman Montazemi
 # @date    (original)  18-May-2021
 #
 ############################################################################
 
-import struct
+# Module imports
 from logging import Logger
 
+# Project imports
 from leahi_dialin.common.constants import NO_RESET
-from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
+from leahi_dialin.common.generic_defs import DataTypes
+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 DenaliChannels
-from leahi_dialin.utils.base import AbstractSubSystem, publish
+from leahi_dialin.protocols.CAN import CanMessenger, CanChannels
+from leahi_dialin.utils.abstract_classes import AbstractSubSystem
+from leahi_dialin.utils.base import publish
 from leahi_dialin.utils.conversions import integer_to_bytearray
 
 
@@ -43,19 +46,18 @@
     AIR_BUBBLE_NORMAL_STATE = 0      # Normal state
     AIR_BUBBLE_SELF_TEST_STATE = 1   # Self-test state
 
-    def __init__(self, can_interface, logger: Logger):
+    def __init__(self, can_interface: CanMessenger, logger: Logger):
         """
-        @param can_interface: Denali Can Messenger object
+        @param can_interface: Can Messenger object
         """
         super().__init__()
         self.can_interface = can_interface
         self.logger = logger
 
         if self.can_interface is not None:
-            channel_id = DenaliChannels.td_sync_broadcast_ch_id
-            self.msg_id_td_bubbles_data = MsgIds.MSG_ID_TD_BUBBLES_DATA.value
-            self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_td_bubbles_data,
-                                                                       self._handler_air_bubbles_data_sync)
+            self.can_interface.register_receiving_publication_function(channel_id = CanChannels.td_sync_broadcast_ch_id,
+                                                                       message_id = MsgIds.MSG_ID_TD_BUBBLES_DATA.value,
+                                                                       function = self._handler_air_bubbles_data_sync)
 
         self.td_air_bubbles_timestamp = 0.0                     #: The timestamp of the last message
 
@@ -78,11 +80,13 @@
         @param message:  published air bubbles data message as: h18 bubble status, h18 bubble state
         @return: None
         """
-        self.h18_bubble_detector[td_enum_repository.TDAirBubbleDetectorNames.H18_ADV.name][td_enum_repository.TDAirBubbleDetectorAttributes.STATUS.name] = (
-            struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])))[0]
-        self.h18_bubble_detector[td_enum_repository.TDAirBubbleDetectorNames.H18_ADV.name][td_enum_repository.TDAirBubbleDetectorAttributes.STATE.name] = (
-            struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2])))[0]
+        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))
 
+        self.process_into_dict(dict_to_update = self.h18_bubble_detector,
+                               decoder_list = sensor_list,
+                               message = message)
         self.td_air_bubbles_timestamp = timestamp
 
 
@@ -100,7 +104,7 @@
         return cmd_generic_broadcast_interval_override(
             ms = ms,
             reset = reset,
-            channel_id = DenaliChannels.dialin_to_td_ch_id,
+            channel_id = CanChannels.dialin_to_td_ch_id,
             msg_id = MsgIds.MSG_ID_TD_BUBBLE_PUBLISH_INTERVAL_OVERRIDE_REQUEST,
             module_name = 'TD Air Bubble Detector',
             logger = self.logger,
@@ -128,7 +132,7 @@
         return cmd_generic_override(
             payload = payload,
             reset = reset,
-            channel_id = DenaliChannels.dialin_to_td_ch_id,
+            channel_id = CanChannels.dialin_to_td_ch_id,
             msg_id = MsgIds.MSG_ID_TD_BUBBLE_OVERRIDE_REQUEST,
             entity_name = f'TD {sensor_name} Bubble Detector status',
             override_text = f'{str(status)}',
@@ -150,7 +154,7 @@
         return cmd_generic_override(
             payload=payload,
             reset=NO_RESET,
-            channel_id=DenaliChannels.dialin_to_td_ch_id,
+            channel_id=CanChannels.dialin_to_td_ch_id,
             msg_id=MsgIds.MSG_ID_TD_ENABLE_VENOUS_BUBBLE_ALARM,
             entity_name='TD Enable Venous Bubble Alarm',
             override_text=f'{ena}',