Index: leahi_dialin/dd/modules/spent_chamber_fill.py
===================================================================
diff -u -r3f4937e339925dde0b95f08e49969f8983c5cba4 -reca9e15bc984af2b7f59eb38f3836ca354ee1251
--- leahi_dialin/dd/modules/spent_chamber_fill.py	(.../spent_chamber_fill.py)	(revision 3f4937e339925dde0b95f08e49969f8983c5cba4)
+++ leahi_dialin/dd/modules/spent_chamber_fill.py	(.../spent_chamber_fill.py)	(revision eca9e15bc984af2b7f59eb38f3836ca354ee1251)
@@ -49,11 +49,51 @@
                                                                        function = self._handler_spent_chamber_fill_sync)
 
         self.dd_spent_chamber_timestamp = 0                     #: The timestamp of the latest message
-        self.execution_state = 0                                #: The execution state
-        self.switching_period = 0                               #: The switching period
-        self.total_spent_chamber_fill_counter = 0               #: The total spent chamber fill counter
+        self.execution_state = 0
+        self.switching_period = 0
+        self.total_spent_chamber_fill_counter = 0
 
 
+
+# ============================================================ Properties ============================================================
+    @property
+    def execution_state(self) -> int:
+        """
+        The execution state
+        """
+        return self._execution_state
+
+    @execution_state.setter
+    def execution_state(self, value: int):
+        self._execution_state = value
+
+
+    @property
+    def switching_period(self) -> int:
+        """
+        The switching period
+        """
+        return self._switching_period
+
+    @switching_period.setter
+    def switching_period(self, value: int):
+        self._switching_period = value
+
+
+    @property
+    def total_spent_chamber_fill_counter(self) -> int:
+        """
+        The total spent chamber fill counter
+        """
+        return self._total_spent_chamber_fill_counter
+
+    @total_spent_chamber_fill_counter.setter
+    def total_spent_chamber_fill_counter(self, value: int):
+        self._total_spent_chamber_fill_counter = value
+
+
+
+# ============================================================ Handlers ============================================================
     @publish(["msg_id_dd_spent_chamber_fill_data",
               "execution_state", "switching_period",
               "total_spent_chamber_fill_counter",
@@ -66,15 +106,16 @@
         @return: None
         """
         msg_list =[]
-        msg_list.append(('self.execution_state',                    DataTypes.U32))
-        msg_list.append(('self.switching_period',                   DataTypes.U32))
-        msg_list.append(('self.total_spent_chamber_fill_counter',   DataTypes.U32))
+        msg_list.append((type(self).execution_state,                    DataTypes.U32))
+        msg_list.append((type(self).switching_period,                   DataTypes.U32))
+        msg_list.append((type(self).total_spent_chamber_fill_counter,   DataTypes.U32))
 
-        self.process_into_vars(decoder_list = msg_list,
-                               message = message)
+        self.process_into_vars(decoder_list = msg_list, message = message)
         self.dd_spent_chamber_timestamp = timestamp
 
 
+
+# ============================================================ Overrides and Requests ============================================================
     def cmd_spent_chamber_fill_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
         """
         Constructs and sends the spent chamber fill data broadcast interval override command