Index: leahi_dialin/dd/modules/conductivity_sensors.py
===================================================================
diff -u -r20c821bd230fc7689a0275a2918981669ff5cc19 -r6d104d3185ac3ed7c18c97ecdc13fd59bf53a8d1
--- leahi_dialin/dd/modules/conductivity_sensors.py	(.../conductivity_sensors.py)	(revision 20c821bd230fc7689a0275a2918981669ff5cc19)
+++ leahi_dialin/dd/modules/conductivity_sensors.py	(.../conductivity_sensors.py)	(revision 6d104d3185ac3ed7c18c97ecdc13fd59bf53a8d1)
@@ -8,22 +8,24 @@
 # @file    conductivity_sensors.py
 #
 # @author  (last)      Zoltan Miskolci
-# @date    (last)      07-Jan-2026
+# @date    (last)      04-May-2026
 # @author  (original)  Quang Nguyen
 # @date    (original)  20-Jul-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 DenaliMessage, 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, float_to_bytearray
 
 
@@ -34,7 +36,7 @@
     Dialysate Delivery (DD) API sub-class for conductivity sensors related commands.
     """
 
-    def __init__(self, can_interface, logger: Logger):
+    def __init__(self, can_interface: DenaliCanMessenger, logger: Logger):
         """
         @param can_interface: Denali Can Messenger object
         """
@@ -44,10 +46,9 @@
         self.logger = logger
 
         if self.can_interface is not None:
-            channel_id = DenaliChannels.dd_sync_broadcast_ch_id
-            self.msg_id_dd_conductivity_data = MsgIds.MSG_ID_DD_CONDUCTIVITY_DATA.value
-            self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_dd_conductivity_data,
-                                                                       self._handler_conductivity_sensors_sync)
+            self.can_interface.register_receiving_publication_function(channel_id = DenaliChannels.dd_sync_broadcast_ch_id,
+                                                                       message_id = MsgIds.MSG_ID_DD_CONDUCTIVITY_DATA.value,
+                                                                       function = self._handler_conductivity_sensors_sync)
 
         self.dd_conductivity_timestamp = 0.0                    #: The timestamp of the last message
 
@@ -71,19 +72,16 @@
         @return: None
         """
         sensor_list =[]
-        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D17_COND, 'f'))
-        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D27_COND, 'f'))
-        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D29_COND, 'f'))
-        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D43_COND, 'f'))
-        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D74_COND, 'f'))
+        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D17_COND, DataTypes.F32))
+        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D27_COND, DataTypes.F32))
+        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D29_COND, DataTypes.F32))
+        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D43_COND, DataTypes.F32))
+        sensor_list.append((dd_enum_repository.DDConductivitySensorNames.D74_COND, DataTypes.F32))
 
-        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}')
-            self.dd_conductivity[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_conductivity,
+                               msg_list = sensor_list,
+                               message = message)
+    
         self.dd_conductivity_timestamp = timestamp