Index: leahi_dialin/fp/modules/ro_pump.py
===================================================================
diff -u -rfc671af6d1a18c900812e68c42ca14da3280e4f1 -rbd0012f61b7c174bf179325fae4b6689b180811e
--- leahi_dialin/fp/modules/ro_pump.py	(.../ro_pump.py)	(revision fc671af6d1a18c900812e68c42ca14da3280e4f1)
+++ leahi_dialin/fp/modules/ro_pump.py	(.../ro_pump.py)	(revision bd0012f61b7c174bf179325fae4b6689b180811e)
@@ -50,7 +50,7 @@
         # The RO Pump data in dictionary format
         self.ro_pump = {
             fp_enum_repository.FPROPumpNames.P12_PUMP.name: {
-                fp_enum_repository.FPPumpAttributes.STATE.name: 0,
+                fp_enum_repository.FPPumpAttributes.STATE.name: fp_enum_repository.FPPumpStates.PUMP_OFF_STATE.value,
                 fp_enum_repository.FPPumpAttributes.DUTY_CYCLE.name: 0,
                 fp_enum_repository.FPPumpAttributes.FB_DUTY_CYCLE.name: 0,
                 fp_enum_repository.FPPumpAttributes.SPEED.name: 0.0,
Index: leahi_dialin/fp/modules/temperatures.py
===================================================================
diff -u -rfc671af6d1a18c900812e68c42ca14da3280e4f1 -rbd0012f61b7c174bf179325fae4b6689b180811e
--- leahi_dialin/fp/modules/temperatures.py	(.../temperatures.py)	(revision fc671af6d1a18c900812e68c42ca14da3280e4f1)
+++ leahi_dialin/fp/modules/temperatures.py	(.../temperatures.py)	(revision bd0012f61b7c174bf179325fae4b6689b180811e)
@@ -200,4 +200,4 @@
             entity_name=f'FP {sensor_name} Temperature Sensor filtered temperature',
             override_text=str(sensor_value),
             logger=self.logger,
-            can_interface=self.can_interface)
\ No newline at end of file
+            can_interface=self.can_interface)
Index: leahi_dialin/fp/modules/valves.py
===================================================================
diff -u -rfc671af6d1a18c900812e68c42ca14da3280e4f1 -rbd0012f61b7c174bf179325fae4b6689b180811e
--- leahi_dialin/fp/modules/valves.py	(.../valves.py)	(revision fc671af6d1a18c900812e68c42ca14da3280e4f1)
+++ leahi_dialin/fp/modules/valves.py	(.../valves.py)	(revision bd0012f61b7c174bf179325fae4b6689b180811e)
@@ -70,10 +70,11 @@
         self.p6_valv = {"id": fp_enum_repository.FPValveNames.P6_VALV.value, "state": DEENERGIZED}      #: The P6 valve's value
 
         #: States of all the vales in list format
-        self.valve_states_enum = [0 for _ in range(fp_enum_repository.FPValveNames.NUM_OF_FP_VALVES.value - 1)]
-
-        for valve in fp_enum_repository.FPValveNames.__members__:
-            self.valves_sensed_states[valve] = ''
+        self.valve_states_enum = {}
+        for i in range(0, fp_enum_repository.FPValveNames.NUM_OF_FP_VALVES.value):
+            valve_name = fp_enum_repository.FPValveNames(i).name.split('_')[0]
+            self.valve_states_enum[valve_name] = 0
+            self.valves_sensed_states[valve_name] = ''
     
     
     @staticmethod
@@ -144,15 +145,14 @@
         self.valve_states_all += fp_valves[0] << 8
 
         # Updating Valve_states_enum
-        for i in range(0, fp_enum_repository.FPValveNames.NUM_OF_FP_VALVES.value - 1):
-            self.valve_states_enum[i] = eval(f'self.{fp_enum_repository.FPValveNames(i).name.lower()}["state"]')
+        for i in range(0, fp_enum_repository.FPValveNames.NUM_OF_FP_VALVES.value):
+            valve_name = fp_enum_repository.FPValveNames(i).name.split('_')[0]
+            self.valve_states_enum[valve_name] = eval(f'self.{fp_enum_repository.FPValveNames(i).name.lower()}["state"]')
         
         # Extract each valve sensed state from U08 valves states using bit-masking
         start = self.END_FP_VALVES_STATES
         end = start + 1
         for valve_id in self.valves_sensed_states:
-            if valve_id.lower().startswith('num'):
-                continue
             self.valves_sensed_states[valve_id] = struct.unpack('B', bytearray(message['message'][start:end]))[0]
             start = end
             end += 1