Index: leahi_dialin/fp/modules/levels.py
===================================================================
diff -u -r5c1132f5aadff6082afa56588ad1f4a64f828cd9 -r6caa49d072aceb2655d605de5d2eea52ab1a8911
--- leahi_dialin/fp/modules/levels.py	(.../levels.py)	(revision 5c1132f5aadff6082afa56588ad1f4a64f828cd9)
+++ leahi_dialin/fp/modules/levels.py	(.../levels.py)	(revision 6caa49d072aceb2655d605de5d2eea52ab1a8911)
@@ -26,7 +26,7 @@
 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 CanMessenger, CanChannels
-from leahi_dialin.utils.abstract_classes import AbstractSubSystem
+from leahi_dialin.utils.abstract_classes import AbstractSubSystem, LocalVars
 from leahi_dialin.utils.base import publish
 from leahi_dialin.utils.conversions import integer_to_bytearray
 
@@ -51,14 +51,28 @@
                                                                        function = self._handler_levels_sync)
 
         self.fp_levels_timestamp = 0                        #: The timestamp of the last message
-
-        #: The Level Sensors data in dictionary format
         self.fp_levels = {
-            fp_enum_repository.FPFloaterLevelSensorNames.P25_LEVEL.name: 0
+            fp_enum_repository.FPFloaterLevelSensorNames.P25_LEVEL.name: fp_enum_repository.FPFloaterLevels.LEVEL_STATE_EMPTY.value
         }
         self.handler_execution_times = []
 
 
+
+# ============================================================ Properties ============================================================
+    @property
+    def fp_levels(self) -> dict:
+        """
+        The Levels data
+        """
+        return self._levels
+
+    @fp_levels.setter
+    def fp_levels(self, value):
+        self._levels = value
+
+
+
+# ============================================================ Handlers ============================================================
     @publish(["msg_id_fp_level_data",
               "fp_levels",
               "fp_levels_timestamp"])
@@ -70,16 +84,21 @@
         @returns none
         """
         start = time.perf_counter()
-        sensor_list =[]
-        sensor_list.append((fp_enum_repository.FPFloaterLevelSensorNames.P25_LEVEL.name,    DataTypes.U32))
+        state = LocalVars('state')
 
-        self.process_into_dict(dict_to_update = self.fp_levels,
-                               decoder_list = sensor_list,
-                               message = message)
+        msg_list =[]
+        msg_list.append((state,    DataTypes.U32))
+
+        self.process_into_vars(decoder_list = msg_list, message = message)
+
+        # Convert the state to enum
+        self.fp_levels[fp_enum_repository.FPFloaterLevelSensorNames.P25_LEVEL.name] = fp_enum_repository.FPFloaterLevels(state.value)
         self.fp_levels_timestamp = timestamp
         self.handler_execution_times.append((timestamp, message, time.perf_counter() - start))
 
 
+
+# ============================================================ Overrides and Requests ============================================================
     def cmd_levels_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
         """
         Constructs and sends an FP levels data broadcast interval override command message.