Index: leahi_dialin/dd/modules/pre_gen_dialysate.py
===================================================================
diff -u -r3f4937e339925dde0b95f08e49969f8983c5cba4 -reca9e15bc984af2b7f59eb38f3836ca354ee1251
--- leahi_dialin/dd/modules/pre_gen_dialysate.py	(.../pre_gen_dialysate.py)	(revision 3f4937e339925dde0b95f08e49969f8983c5cba4)
+++ leahi_dialin/dd/modules/pre_gen_dialysate.py	(.../pre_gen_dialysate.py)	(revision eca9e15bc984af2b7f59eb38f3836ca354ee1251)
@@ -16,9 +16,11 @@
 
 # Module imports
 from logging import Logger
+from typing import Union
 
 # Project imports
 from leahi_dialin.common.constants import NO_RESET
+from leahi_dialin.common.dd_defs import DDPreGenDialysateStates
 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
@@ -53,16 +55,95 @@
                                                                        function = self._handler_pre_gen_request_sync)
 
         self.pre_gen_state_timestamp = 0                        #: The timestamp of the latest Pre-Gen State message
-        self.execution_state = 0                                #: The execution state
+        self.execution_state = DDPreGenDialysateStates.NUM_OF_DD_PRE_GEN_DIALYSATE_STATES
 
         self.pre_gen_request_timestamp = 0                      #: The timestamp of the latest Pre-Gen Request message
-        self.pre_gen_start = 0                                  #: The Pre-Gen start value
-        self.pre_gen_dial_rate = 0.0                            #: The Pre-Gen dialysate rate
-        self.pre_gen_dial_temp = 0.0                            #: The Pre-Gen dialysate temperature
-        self.pre_gen_acid = 0                                   #: The Pre-Gen acid concentrate option index
-        self.pre_gen_bicarb  = 0                                #: The Pre-Gen bicarb concentrate option index
+        self.pre_gen_start = 0
+        self.pre_gen_dial_rate = 0.0
+        self.pre_gen_dial_temp = 0.0
+        self.pre_gen_acid = 0
+        self.pre_gen_bicarb  = 0
 
 
+
+# ============================================================ Properties ============================================================
+    @property
+    def execution_state(self) -> DDPreGenDialysateStates:
+        """
+        The execution state
+        """
+        return self._execution_state
+
+    @execution_state.setter
+    def execution_state(self, value: Union[int, DDPreGenDialysateStates]):
+        if isinstance(value, int):
+            self._execution_state = DDPreGenDialysateStates(value)
+        else:
+            self._execution_state = value
+
+
+    @property
+    def pre_gen_start(self) -> int:
+        """
+        he Pre-Gen start value
+        """
+        return self._start
+
+    @pre_gen_start.setter
+    def pre_gen_start(self, value: int):
+        self._start = value
+
+
+    @property
+    def pre_gen_dial_rate(self) -> float:
+        """
+        The Pre-Gen dialysate rate
+        """
+        return self._dial_rate
+
+    @pre_gen_dial_rate.setter
+    def pre_gen_dial_rate(self, value: float):
+        self._dial_rate = value
+
+
+    @property
+    def pre_gen_dial_temp(self) -> float:
+        """
+        The Pre-Gen dialysate temperature
+        """
+        return self._dial_temp
+
+    @pre_gen_dial_temp.setter
+    def pre_gen_dial_temp(self, value: float):
+        self._dial_temp = value
+
+
+    @property
+    def pre_gen_acid(self) -> int:
+        """
+        he Pre-Gen acid concentrate option index
+        """
+        return self._acid
+
+    @pre_gen_acid.setter
+    def pre_gen_acid(self, value: int):
+        self._acid = value
+
+
+    @property
+    def pre_gen_bicarb(self) -> int:
+        """
+        he Pre-Gen bicarb concentrate option index
+        """
+        return self._bicarb
+
+    @pre_gen_bicarb.setter
+    def pre_gen_bicarb(self, value: int):
+        self._bicarb = value
+
+
+
+# ============================================================ Handlers ============================================================
     @publish(["msg_id_dd_pre_gen_dialysate_state_data", "execution_state", "pre_gen_state_timestamp"])
     def _handler_pre_gen_state_sync(self, message, timestamp=0.0):
         """
@@ -72,11 +153,9 @@
         @return: None
         """
         msg_list =[]
-        msg_list.append(('self.execution_state', DataTypes.U32))
+        msg_list.append((type(self).execution_state, DataTypes.U32))
 
-        self.process_into_vars(decoder_list = msg_list,
-                               message = message)
-
+        self.process_into_vars(decoder_list = msg_list, message = message)
         self.pre_gen_state_timestamp = timestamp
 
 
@@ -92,17 +171,18 @@
         @return: None
         """
         msg_list =[]
-        msg_list.append(('self.pre_gen_start',      DataTypes.U32))
-        msg_list.append(('self.pre_gen_dial_rate',  DataTypes.F32))
-        msg_list.append(('self.pre_gen_dial_temp',  DataTypes.F32))
-        msg_list.append(('self.pre_gen_acid',       DataTypes.U32))
-        msg_list.append(('self.pre_gen_bicarb',     DataTypes.U32))
+        msg_list.append((type(self).pre_gen_start,      DataTypes.U32))
+        msg_list.append((type(self).pre_gen_dial_rate,  DataTypes.F32))
+        msg_list.append((type(self).pre_gen_dial_temp,  DataTypes.F32))
+        msg_list.append((type(self).pre_gen_acid,       DataTypes.U32))
+        msg_list.append((type(self).pre_gen_bicarb,     DataTypes.U32))
 
-        self.process_into_vars(decoder_list = msg_list,
-                               message = message)
+        self.process_into_vars(decoder_list = msg_list, message = message)
         self.pre_gen_request_timestamp = timestamp
 
 
+
+# ============================================================ Overrides and Requests ============================================================
     def cmd_pre_gen_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
         """
         Constructs and sends the broadcast time interval override for pre gen dialysate data.