Index: leahi_dialin/fp/modules/permeate_tank.py
===================================================================
diff -u -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 -rba415df9f8e76d6b0f21e8f69ba99346e42f7b09
--- leahi_dialin/fp/modules/permeate_tank.py	(.../permeate_tank.py)	(revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6)
+++ leahi_dialin/fp/modules/permeate_tank.py	(.../permeate_tank.py)	(revision ba415df9f8e76d6b0f21e8f69ba99346e42f7b09)
@@ -20,7 +20,7 @@
 # Project imports
 from leahi_dialin.common.constants import NO_RESET
 from leahi_dialin.common.generic_defs import DataTypes
-from leahi_dialin.common.msg_defs import MsgIds
+from leahi_dialin.common.msg_ids import MsgIds
 from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override
 from leahi_dialin.protocols.CAN import CanMessenger, CanChannels
 from leahi_dialin.utils.abstract_classes import AbstractSubSystem
@@ -49,9 +49,25 @@
                                                                        function = self._handler_permeate_tank_sync)
 
         self.permeate_tank_timestamp = 0.0                      #: The timestamp of the last message
-        self.permeate_tank_state = 0                            #: The Permeate Tank's State value
+        self.permeate_tank_state = 0
 
 
+
+# ============================================================ Properties ============================================================
+    @property
+    def permeate_tank_state(self) -> int:
+        """
+        The Permeate Tank state
+        """
+        return self._permeate_tank_state
+
+    @permeate_tank_state.setter
+    def permeate_tank_state(self, value):
+        self._permeate_tank_state = value
+
+
+
+# ============================================================ Handlers ============================================================
     @publish(["msg_id_fp_permeate_tank_data", "permeate_tank_state", "permeate_tank_timestamp"])
     def _handler_permeate_tank_sync(self, message, timestamp=0.0):
         """
@@ -61,13 +77,14 @@
         @return: None
         """
         msg_list =[]
-        msg_list.append(('self.permeate_tank_state',    DataTypes.U32))
+        msg_list.append((type(self).permeate_tank_state,    DataTypes.U32))
 
-        self.process_into_vars(decoder_list = msg_list,
-                               message = message)
+        self.process_into_vars(decoder_list = msg_list, message = message)
         self.permeate_tank_timestamp = timestamp
 
 
+
+# ============================================================ Overrides and Requests ============================================================
     def cmd_permeate_tank_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
         """
         Constructs and sends the broadcast time interval override for permeate tank data.