Index: leahi_dialin/dd/modules/levels.py
===================================================================
diff -u -rb8ea59d46e0b361ffb73e2496770041bb6693e1d -r6d104d3185ac3ed7c18c97ecdc13fd59bf53a8d1
--- leahi_dialin/dd/modules/levels.py	(.../levels.py)	(revision b8ea59d46e0b361ffb73e2496770041bb6693e1d)
+++ leahi_dialin/dd/modules/levels.py	(.../levels.py)	(revision 6d104d3185ac3ed7c18c97ecdc13fd59bf53a8d1)
@@ -8,21 +8,24 @@
 # @file    levels.py
 #
 # @author  (last)      Zoltan Miskolci
-# @date    (last)      07-Jan-2026
+# @date    (last)      04-May-2026
 # @author  (original)  Dara Navaei
 # @date    (original)  29-May-2020
 #
 ############################################################################
 
-import struct
+# Module imports
 from logging import Logger
 
+# Project imports
 from leahi_dialin.common.constants import NO_RESET
 from leahi_dialin.common import dd_enum_repository
-from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
+from leahi_dialin.common.generic_defs import DataTypes
+from leahi_dialin.common.msg_defs import MsgIds
 from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override
-from leahi_dialin.protocols.CAN import DenaliChannels
-from leahi_dialin.utils.base import AbstractSubSystem, publish
+from leahi_dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels
+from leahi_dialin.utils.abstract_classes import AbstractSubSystem
+from leahi_dialin.utils.base import publish
 from leahi_dialin.utils.conversions import integer_to_bytearray
 
 
@@ -31,7 +34,7 @@
     Dialysate Delivery (DD) Dialin API sub-class for levels related commands.
     """
 
-    def __init__(self, can_interface, logger: Logger):
+    def __init__(self, can_interface: DenaliCanMessenger, logger: Logger):
         """
         @param can_interface: Denali CAN Messenger object
         """
@@ -41,9 +44,9 @@
         self.logger = logger
 
         if self.can_interface is not None:
-            channel_id = DenaliChannels.dd_sync_broadcast_ch_id
-            self.msg_id_dd_level_data = MsgIds.MSG_ID_DD_LEVEL_DATA.value
-            self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_dd_level_data, self._handler_levels_sync)
+            self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.dd_sync_broadcast_ch_id,
+                                                                       message_id = MsgIds.MSG_ID_DD_LEVEL_DATA.value,
+                                                                       function = self._handler_levels_sync)
 
         self.dd_levels_timestamp = 0                            #: The timestamp of the latest message
 
@@ -66,21 +69,21 @@
         @returns none
         """
         sensor_list =[]
-        sensor_list.append((dd_enum_repository.DDLevelSensorNames.D46_LEVEL, 'i'))
-        sensor_list.append((dd_enum_repository.DDLevelSensorNames.D63_LEVEL, 'i'))
-        sensor_list.append((dd_enum_repository.DDLevelSensorNames.D98_LEVEL, 'i'))
-        sensor_list.append((dd_enum_repository.DDLevelSensorNames.D6_LEVEL, 'i'))
+        sensor_list.append((dd_enum_repository.DDLevelSensorNames.D46_LEVEL,    DataTypes.U32))
+        sensor_list.append((dd_enum_repository.DDLevelSensorNames.D63_LEVEL,    DataTypes.U32))
+        sensor_list.append((dd_enum_repository.DDLevelSensorNames.D98_LEVEL,    DataTypes.U32))
+        sensor_list.append((dd_enum_repository.DDLevelSensorNames.D6_LEVEL,     DataTypes.U32))
+        msg_list =[]
+        msg_list.append(('self.dd_bicarb_level', DataTypes.U32))
 
-        i = 1
-        for sensor in sensor_list:
-            start_pos = eval(f'MsgFieldPositions.START_POS_FIELD_{i}')
-            end_pos = eval(f'MsgFieldPositions.END_POS_FIELD_{i}')
-            if i == 5:
-                self.dd_bicarb_level = struct.unpack('i', bytearray(message['message'][start_pos:end_pos]))[0]
-            else:
-                self.dd_level_sensors[sensor[0].name] = struct.unpack(sensor[1], bytearray(message['message'][start_pos:end_pos]))[0]
-            i += 1
+        self.process_into_dict(dict_to_update = self.dd_level_sensors,
+                               decoder_list = sensor_list,
+                               message = message)
+        self.process_into_vars(decoder_list = msg_list,
+                               message = message,
+                               start_from_byte = len(sensor_list) * DataTypes.U32.size())
 
+
         self.dd_levels_timestamp = timestamp