Index: leahi_dialin/fp/modules/levels.py
===================================================================
diff -u -rb0929a0985784c80e2d184413995a87e6aa23d4b -re45b20cdc5d4c5dcff8cef530b173ca94cb2e422
--- leahi_dialin/fp/modules/levels.py	(.../levels.py)	(revision b0929a0985784c80e2d184413995a87e6aa23d4b)
+++ leahi_dialin/fp/modules/levels.py	(.../levels.py)	(revision e45b20cdc5d4c5dcff8cef530b173ca94cb2e422)
@@ -8,22 +8,25 @@
 # @file    levels.py
 #
 # @author  (last)      Zoltan Miskolci
-# @date    (last)      09-Jan-2026
+# @date    (last)      05-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.fp_defs import BETA_IOFP_LEVEL_OFFSET
 from leahi_dialin.common import fp_enum_repository
-from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
+from leahi_dialin.common.fp_defs import BETA_IOFP_LEVEL_OFFSET
+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.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
 
 
@@ -32,19 +35,19 @@
         Dialin API sub-class for levels related commands.
     """
 
-    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.fp_sync_broadcast_ch_id
-            self.msg_id_fp_level_data = MsgIds.MSG_ID_FP_LEVEL_DATA.value
-            self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_fp_level_data, self._handler_levels_sync)
+            self.can_interface.register_receiving_publication_function(channel_id = CanChannels.fp_sync_broadcast_ch_id,
+                                                                       message_id = MsgIds.MSG_ID_FP_LEVEL_DATA.value,
+                                                                       function = self._handler_levels_sync)
 
         self.fp_levels_timestamp = 0                        #: The timestamp of the last message
 
@@ -64,9 +67,12 @@
         @param message:  published levels data message
         @returns none
         """
-        self.fp_levels[fp_enum_repository.FPFloaterLevelSensorNames.P25_LEVEL.name] = struct.unpack('i', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0]
+        sensor_list =[]
+        sensor_list.append((fp_enum_repository.FPFloaterLevelSensorNames.P25_LEVEL.name,    DataTypes.U32))
 
+        self.process_into_dict(dict_to_update = self.fp_levels,
+                               decoder_list = sensor_list,
+                               message = message)
         self.fp_levels_timestamp = timestamp
 
 
@@ -84,7 +90,7 @@
         return cmd_generic_broadcast_interval_override(
             ms = ms,
             reset = reset,
-            channel_id = DenaliChannels.dialin_to_fp_ch_id,
+            channel_id = CanChannels.dialin_to_fp_ch_id,
             msg_id = MsgIds.MSG_ID_FP_LEVEL_PUBLISH_INTERVAL_OVERRIDE_REQUEST,
             module_name = 'FP Levels',
             logger = self.logger,
@@ -110,7 +116,7 @@
         return cmd_generic_override(
             payload = payload,
             reset = reset,
-            channel_id = DenaliChannels.dialin_to_fp_ch_id,
+            channel_id = CanChannels.dialin_to_fp_ch_id,
             msg_id = MsgIds.MSG_ID_FP_FLOATER_LEVEL_OVERRIDE_REQUEST,
             entity_name = f'FP Levels status',
             override_text = f'{str(status)}',