Index: leahi_dialin/dd/modules/alarms.py
===================================================================
diff -u -r820c94585ab5d85c40395e828c4dfe2da164c105 -r5c1132f5aadff6082afa56588ad1f4a64f828cd9
--- leahi_dialin/dd/modules/alarms.py	(.../alarms.py)	(revision 820c94585ab5d85c40395e828c4dfe2da164c105)
+++ leahi_dialin/dd/modules/alarms.py	(.../alarms.py)	(revision 5c1132f5aadff6082afa56588ad1f4a64f828cd9)
@@ -118,7 +118,7 @@
         self.last_alarm_data_1 = result['data_1']
         self.last_alarm_data_2 = result['data_2']
         self.dd_alarm_triggered_timestamp = timestamp
-        self.handler_execution_times.append(time.perf_counter() - start)
+        self.handler_execution_times.append((timestamp, message, time.perf_counter() - start))
 
 
     @publish(["msg_id_dd_alarm_info", "alarm_safety_shutdown_status",  "dd_alarm_info_timestamp"])
Index: leahi_dialin/dd/modules/balancing_chamber.py
===================================================================
diff -u -r820c94585ab5d85c40395e828c4dfe2da164c105 -r5c1132f5aadff6082afa56588ad1f4a64f828cd9
--- leahi_dialin/dd/modules/balancing_chamber.py	(.../balancing_chamber.py)	(revision 820c94585ab5d85c40395e828c4dfe2da164c105)
+++ leahi_dialin/dd/modules/balancing_chamber.py	(.../balancing_chamber.py)	(revision 5c1132f5aadff6082afa56588ad1f4a64f828cd9)
@@ -91,7 +91,7 @@
                                message = message)
 
         self.dd_bal_chamber_timestamp = timestamp
-        self.handler_execution_times.append(time.perf_counter() - start)
+        self.handler_execution_times.append((timestamp, message, time.perf_counter() - start))
 
     def cmd_balancing_chamber_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
         """
Index: leahi_dialin/dd/modules/blood_leak.py
===================================================================
diff -u -r820c94585ab5d85c40395e828c4dfe2da164c105 -r5c1132f5aadff6082afa56588ad1f4a64f828cd9
--- leahi_dialin/dd/modules/blood_leak.py	(.../blood_leak.py)	(revision 820c94585ab5d85c40395e828c4dfe2da164c105)
+++ leahi_dialin/dd/modules/blood_leak.py	(.../blood_leak.py)	(revision 5c1132f5aadff6082afa56588ad1f4a64f828cd9)
@@ -160,7 +160,7 @@
         self.process_into_vars(decoder_list = msg_list,
                                message = message)
         self.dd_blood_leak_status_timestamp = timestamp
-        self.handler_execution_times.append(time.perf_counter() - start)
+        self.handler_execution_times.append((timestamp, message, time.perf_counter() - start))
 
 
     @publish(['msg_id_dd_send_blood_leak_emb_mode_response', 'blood_leak_emb_mode_cmd_response',
Index: leahi_dialin/dd/modules/concentrate_pump.py
===================================================================
diff -u -r820c94585ab5d85c40395e828c4dfe2da164c105 -r5c1132f5aadff6082afa56588ad1f4a64f828cd9
--- leahi_dialin/dd/modules/concentrate_pump.py	(.../concentrate_pump.py)	(revision 820c94585ab5d85c40395e828c4dfe2da164c105)
+++ leahi_dialin/dd/modules/concentrate_pump.py	(.../concentrate_pump.py)	(revision 5c1132f5aadff6082afa56588ad1f4a64f828cd9)
@@ -132,7 +132,7 @@
                                decoder_list = sensor_list,
                                message = message)
         self.dd_concentrate_pump_timestamp = timestamp
-        self.handler_execution_times.append(time.perf_counter()-start)
+        self.handler_execution_times.append((timestamp, message, time.perf_counter() - start))
 
 
 
Index: leahi_dialin/dd/modules/conductivity_sensors.py
===================================================================
diff -u -r820c94585ab5d85c40395e828c4dfe2da164c105 -r5c1132f5aadff6082afa56588ad1f4a64f828cd9
--- leahi_dialin/dd/modules/conductivity_sensors.py	(.../conductivity_sensors.py)	(revision 820c94585ab5d85c40395e828c4dfe2da164c105)
+++ leahi_dialin/dd/modules/conductivity_sensors.py	(.../conductivity_sensors.py)	(revision 5c1132f5aadff6082afa56588ad1f4a64f828cd9)
@@ -137,7 +137,7 @@
                                decoder_list = sensor_list,
                                message = message)
         self.dd_conductivity_resistance_timestamp = timestamp
-        self.handler_resist_execution_times.append(time.perf_counter() - start)
+        self.handler_resist_execution_times.append((timestamp, message, time.perf_counter() - start))
 
     @publish(["msg_id_dd_conductivity_version_data", "dd_conductivity_resistance", "dd_conductivity_version_timestamp"])
     def _handler_conductivity_version_sync(self, message, timestamp=0.0):
Index: leahi_dialin/dd/modules/dialysate_pump.py
===================================================================
diff -u -r820c94585ab5d85c40395e828c4dfe2da164c105 -r5c1132f5aadff6082afa56588ad1f4a64f828cd9
--- leahi_dialin/dd/modules/dialysate_pump.py	(.../dialysate_pump.py)	(revision 820c94585ab5d85c40395e828c4dfe2da164c105)
+++ leahi_dialin/dd/modules/dialysate_pump.py	(.../dialysate_pump.py)	(revision 5c1132f5aadff6082afa56588ad1f4a64f828cd9)
@@ -119,7 +119,7 @@
                                decoder_list = sensor_list,
                                message = message)
         self.dd_dialysate_pump_timestamp = timestamp
-        self.handler_execution_times.append(time.perf_counter()-start)
+        self.handler_execution_times.append((timestamp, message, time.perf_counter() - start))
 
 
     def cmd_dialysate_pump_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
Index: leahi_dialin/dd/modules/events.py
===================================================================
diff -u -r820c94585ab5d85c40395e828c4dfe2da164c105 -r5c1132f5aadff6082afa56588ad1f4a64f828cd9
--- leahi_dialin/dd/modules/events.py	(.../events.py)	(revision 820c94585ab5d85c40395e828c4dfe2da164c105)
+++ leahi_dialin/dd/modules/events.py	(.../events.py)	(revision 5c1132f5aadff6082afa56588ad1f4a64f828cd9)
@@ -293,7 +293,7 @@
         # Update event dictionary
         self._event_dictionary[event_enum.name].append(event_tuple)
         self.events_timestamp = timestamp
-        self.handler_execution_times.append(time.perf_counter() - start)
+        self.handler_execution_times.append((timestamp, message, time.perf_counter() - start))
 
 
 
Index: leahi_dialin/dd/modules/gen_dialysate.py
===================================================================
diff -u -r820c94585ab5d85c40395e828c4dfe2da164c105 -r5c1132f5aadff6082afa56588ad1f4a64f828cd9
--- leahi_dialin/dd/modules/gen_dialysate.py	(.../gen_dialysate.py)	(revision 820c94585ab5d85c40395e828c4dfe2da164c105)
+++ leahi_dialin/dd/modules/gen_dialysate.py	(.../gen_dialysate.py)	(revision 5c1132f5aadff6082afa56588ad1f4a64f828cd9)
@@ -80,7 +80,7 @@
         self.process_into_vars(decoder_list = msg_list,
                                message = message)
         self.dd_gen_dialysate_timestamp = timestamp
-        self.handler_execution_times.append(time.perf_counter() - start)
+        self.handler_execution_times.append((timestamp, message, time.perf_counter() - start))
 
 
     def cmd_gen_dialysate_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
Index: leahi_dialin/dd/modules/heaters.py
===================================================================
diff -u -r820c94585ab5d85c40395e828c4dfe2da164c105 -r5c1132f5aadff6082afa56588ad1f4a64f828cd9
--- leahi_dialin/dd/modules/heaters.py	(.../heaters.py)	(revision 820c94585ab5d85c40395e828c4dfe2da164c105)
+++ leahi_dialin/dd/modules/heaters.py	(.../heaters.py)	(revision 5c1132f5aadff6082afa56588ad1f4a64f828cd9)
@@ -126,7 +126,7 @@
                                message = message,
                                start_from_byte = len(sensor_list) * DataTypes.U32.size())
         self.dd_heaters_timestamp = timestamp
-        self.handler_execution_times.append(time.perf_counter()-start)
+        self.handler_execution_times.append((timestamp, message, time.perf_counter() - start))
 
 
     def cmd_heaters_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
Index: leahi_dialin/dd/modules/levels.py
===================================================================
diff -u -r820c94585ab5d85c40395e828c4dfe2da164c105 -r5c1132f5aadff6082afa56588ad1f4a64f828cd9
--- leahi_dialin/dd/modules/levels.py	(.../levels.py)	(revision 820c94585ab5d85c40395e828c4dfe2da164c105)
+++ leahi_dialin/dd/modules/levels.py	(.../levels.py)	(revision 5c1132f5aadff6082afa56588ad1f4a64f828cd9)
@@ -86,7 +86,7 @@
                                message = message,
                                start_from_byte = len(sensor_list) * DataTypes.U32.size())
         self.dd_levels_timestamp = timestamp
-        self.handler_execution_times.append(time.perf_counter() - start)
+        self.handler_execution_times.append((timestamp, message, time.perf_counter() - start))
 
 
     def cmd_levels_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
Index: leahi_dialin/dd/modules/post_gen_dialysate.py
===================================================================
diff -u -r820c94585ab5d85c40395e828c4dfe2da164c105 -r5c1132f5aadff6082afa56588ad1f4a64f828cd9
--- leahi_dialin/dd/modules/post_gen_dialysate.py	(.../post_gen_dialysate.py)	(revision 820c94585ab5d85c40395e828c4dfe2da164c105)
+++ leahi_dialin/dd/modules/post_gen_dialysate.py	(.../post_gen_dialysate.py)	(revision 5c1132f5aadff6082afa56588ad1f4a64f828cd9)
@@ -69,7 +69,7 @@
         self.process_into_vars(decoder_list = msg_list,
                                message = message)
         self.post_gen_state_timestamp = timestamp
-        self.handler_execution_times.append(time.perf_counter() - start)
+        self.handler_execution_times.append((timestamp, message, time.perf_counter() - start))
 
 
     def cmd_post_gen_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
Index: leahi_dialin/dd/modules/pre_gen_dialysate.py
===================================================================
diff -u -r820c94585ab5d85c40395e828c4dfe2da164c105 -r5c1132f5aadff6082afa56588ad1f4a64f828cd9
--- leahi_dialin/dd/modules/pre_gen_dialysate.py	(.../pre_gen_dialysate.py)	(revision 820c94585ab5d85c40395e828c4dfe2da164c105)
+++ leahi_dialin/dd/modules/pre_gen_dialysate.py	(.../pre_gen_dialysate.py)	(revision 5c1132f5aadff6082afa56588ad1f4a64f828cd9)
@@ -81,7 +81,7 @@
                                message = message)
 
         self.pre_gen_state_timestamp = timestamp
-        self.handler_execution_times.append(time.perf_counter() - start)
+        self.handler_execution_times.append((timestamp, message, time.perf_counter() - start))
 
 
     @publish(["msg_id_dd_pre_gen_dialysate_request_data",
Index: leahi_dialin/dd/modules/pressure_sensors.py
===================================================================
diff -u -r820c94585ab5d85c40395e828c4dfe2da164c105 -r5c1132f5aadff6082afa56588ad1f4a64f828cd9
--- leahi_dialin/dd/modules/pressure_sensors.py	(.../pressure_sensors.py)	(revision 820c94585ab5d85c40395e828c4dfe2da164c105)
+++ leahi_dialin/dd/modules/pressure_sensors.py	(.../pressure_sensors.py)	(revision 5c1132f5aadff6082afa56588ad1f4a64f828cd9)
@@ -84,7 +84,7 @@
                                decoder_list = sensor_list,
                                message = message)
         self.dd_pressures_timestamp = timestamp
-        self.handler_execution_times.append(time.perf_counter() - start)
+        self.handler_execution_times.append((timestamp, message, time.perf_counter() - start))
 
     def cmd_pressure_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
         """
Index: leahi_dialin/dd/modules/rinse_pump.py
===================================================================
diff -u -r820c94585ab5d85c40395e828c4dfe2da164c105 -r5c1132f5aadff6082afa56588ad1f4a64f828cd9
--- leahi_dialin/dd/modules/rinse_pump.py	(.../rinse_pump.py)	(revision 820c94585ab5d85c40395e828c4dfe2da164c105)
+++ leahi_dialin/dd/modules/rinse_pump.py	(.../rinse_pump.py)	(revision 5c1132f5aadff6082afa56588ad1f4a64f828cd9)
@@ -76,7 +76,7 @@
         self.process_into_vars(decoder_list = msg_list,
                                message = message)
         self.dd_rinse_pump_timestamp = timestamp
-        self.handler_execution_times.append(time.perf_counter() - start)
+        self.handler_execution_times.append((timestamp, message, time.perf_counter() - start))
 
 
     def cmd_rinse_pump_data_publish_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
Index: leahi_dialin/dd/modules/spent_chamber_fill.py
===================================================================
diff -u -r820c94585ab5d85c40395e828c4dfe2da164c105 -r5c1132f5aadff6082afa56588ad1f4a64f828cd9
--- leahi_dialin/dd/modules/spent_chamber_fill.py	(.../spent_chamber_fill.py)	(revision 820c94585ab5d85c40395e828c4dfe2da164c105)
+++ leahi_dialin/dd/modules/spent_chamber_fill.py	(.../spent_chamber_fill.py)	(revision 5c1132f5aadff6082afa56588ad1f4a64f828cd9)
@@ -76,7 +76,7 @@
         self.process_into_vars(decoder_list = msg_list,
                                message = message)
         self.dd_spent_chamber_timestamp = timestamp
-        self.handler_execution_times.append(time.perf_counter() - start)
+        self.handler_execution_times.append((timestamp, message, time.perf_counter() - start))
 
 
     def cmd_spent_chamber_fill_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
Index: leahi_dialin/dd/modules/substitution_pump.py
===================================================================
diff -u -r820c94585ab5d85c40395e828c4dfe2da164c105 -r5c1132f5aadff6082afa56588ad1f4a64f828cd9
--- leahi_dialin/dd/modules/substitution_pump.py	(.../substitution_pump.py)	(revision 820c94585ab5d85c40395e828c4dfe2da164c105)
+++ leahi_dialin/dd/modules/substitution_pump.py	(.../substitution_pump.py)	(revision 5c1132f5aadff6082afa56588ad1f4a64f828cd9)
@@ -85,7 +85,7 @@
                                message = message)
 
         self.dd_substitution_pump_timestamp = timestamp
-        self.handler_execution_times.append(time.perf_counter() - start)
+        self.handler_execution_times.append((timestamp, message, time.perf_counter() - start))
 
     def cmd_substitution_pump_data_publish_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
         """
Index: leahi_dialin/dd/modules/temperature_sensors.py
===================================================================
diff -u -r820c94585ab5d85c40395e828c4dfe2da164c105 -r5c1132f5aadff6082afa56588ad1f4a64f828cd9
--- leahi_dialin/dd/modules/temperature_sensors.py	(.../temperature_sensors.py)	(revision 820c94585ab5d85c40395e828c4dfe2da164c105)
+++ leahi_dialin/dd/modules/temperature_sensors.py	(.../temperature_sensors.py)	(revision 5c1132f5aadff6082afa56588ad1f4a64f828cd9)
@@ -115,7 +115,7 @@
                                decoder_list = sensor_list,
                                message = message)
         self.dd_temperatures_timestamp = timestamp
-        self.handler_execution_times.append(time.perf_counter()-start)
+        self.handler_execution_times.append((timestamp, message, time.perf_counter() - start))
         
 
 
Index: leahi_dialin/dd/modules/ultrafiltration.py
===================================================================
diff -u -r820c94585ab5d85c40395e828c4dfe2da164c105 -r5c1132f5aadff6082afa56588ad1f4a64f828cd9
--- leahi_dialin/dd/modules/ultrafiltration.py	(.../ultrafiltration.py)	(revision 820c94585ab5d85c40395e828c4dfe2da164c105)
+++ leahi_dialin/dd/modules/ultrafiltration.py	(.../ultrafiltration.py)	(revision 5c1132f5aadff6082afa56588ad1f4a64f828cd9)
@@ -77,7 +77,7 @@
         self.process_into_vars(decoder_list = msg_list,
                                message = message)
         self.uf_timestamp = timestamp
-        self.handler_execution_times.append(time.perf_counter() - start)
+        self.handler_execution_times.append((timestamp, message, time.perf_counter() - start))
 
 
     def cmd_uf_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
Index: leahi_dialin/dd/modules/valves.py
===================================================================
diff -u -r820c94585ab5d85c40395e828c4dfe2da164c105 -r5c1132f5aadff6082afa56588ad1f4a64f828cd9
--- leahi_dialin/dd/modules/valves.py	(.../valves.py)	(revision 820c94585ab5d85c40395e828c4dfe2da164c105)
+++ leahi_dialin/dd/modules/valves.py	(.../valves.py)	(revision 5c1132f5aadff6082afa56588ad1f4a64f828cd9)
@@ -288,7 +288,7 @@
             start = end
             end += 1
         self.dd_valves_states_timestamp = timestamp
-        self.handler_execution_times.append(time.perf_counter() - start)
+        self.handler_execution_times.append((timestamp, message, time.perf_counter() - start))
 
 
     def cmd_valve_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
Index: leahi_dialin/dd/modules/voltages.py
===================================================================
diff -u -r820c94585ab5d85c40395e828c4dfe2da164c105 -r5c1132f5aadff6082afa56588ad1f4a64f828cd9
--- leahi_dialin/dd/modules/voltages.py	(.../voltages.py)	(revision 820c94585ab5d85c40395e828c4dfe2da164c105)
+++ leahi_dialin/dd/modules/voltages.py	(.../voltages.py)	(revision 5c1132f5aadff6082afa56588ad1f4a64f828cd9)
@@ -96,7 +96,7 @@
                                decoder_list = sensor_list,
                                message = message)
         self.dd_voltages_timestamp = timestamp
-        self.handler_execution_times.append(time.perf_counter()-start)
+        self.handler_execution_times.append((timestamp, message, time.perf_counter() - start))
 
 
     def cmd_monitored_voltages_broadcast_interval_override(self, ms: int = 1000, reset: int = NO_RESET) -> int:
Index: leahi_dialin/fp/modules/alarms.py
===================================================================
diff -u -r820c94585ab5d85c40395e828c4dfe2da164c105 -r5c1132f5aadff6082afa56588ad1f4a64f828cd9
--- leahi_dialin/fp/modules/alarms.py	(.../alarms.py)	(revision 820c94585ab5d85c40395e828c4dfe2da164c105)
+++ leahi_dialin/fp/modules/alarms.py	(.../alarms.py)	(revision 5c1132f5aadff6082afa56588ad1f4a64f828cd9)
@@ -115,7 +115,7 @@
         self.last_alarm_data_1 = result['data_1']
         self.last_alarm_data_2 = result['data_2']
         self.fp_alarm_triggered_timestamp = timestamp
-        self.handler_execution_times.append(time.perf_counter() - start)
+        self.handler_execution_times.append((timestamp, message, time.perf_counter() - start))
 
 
     def cmd_alarm_state_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
Index: leahi_dialin/fp/modules/boost_pump.py
===================================================================
diff -u -r820c94585ab5d85c40395e828c4dfe2da164c105 -r5c1132f5aadff6082afa56588ad1f4a64f828cd9
--- leahi_dialin/fp/modules/boost_pump.py	(.../boost_pump.py)	(revision 820c94585ab5d85c40395e828c4dfe2da164c105)
+++ leahi_dialin/fp/modules/boost_pump.py	(.../boost_pump.py)	(revision 5c1132f5aadff6082afa56588ad1f4a64f828cd9)
@@ -92,7 +92,7 @@
                                decoder_list = sensor_list,
                                message = message)
         self.boost_pump_timestamp = timestamp
-        self.handler_execution_times.append(time.perf_counter() - start)
+        self.handler_execution_times.append((timestamp, message, time.perf_counter() - start))
 
 
     def cmd_boost_pump_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
Index: leahi_dialin/fp/modules/conductivity_sensors.py
===================================================================
diff -u -r820c94585ab5d85c40395e828c4dfe2da164c105 -r5c1132f5aadff6082afa56588ad1f4a64f828cd9
--- leahi_dialin/fp/modules/conductivity_sensors.py	(.../conductivity_sensors.py)	(revision 820c94585ab5d85c40395e828c4dfe2da164c105)
+++ leahi_dialin/fp/modules/conductivity_sensors.py	(.../conductivity_sensors.py)	(revision 5c1132f5aadff6082afa56588ad1f4a64f828cd9)
@@ -110,7 +110,7 @@
                                decoder_list = sensor_list,
                                message = message)
         self.fp_conductivity_timestamp = timestamp
-        self.handler_execution_times.append(time.perf_counter() - start)
+        self.handler_execution_times.append((timestamp, message, time.perf_counter() - start))
 
 
     @publish(["msg_id_ro_rejection_ratio_data", "ro_rejection_ratio", "ro_rejection_ratio_timestamp"])
@@ -134,7 +134,7 @@
                                decoder_list = sensor_list,
                                message = message)
         self.ro_rejection_ratio_timestamp = timestamp
-        self.handler_ro_execution_times.append(time.perf_counter() - start)
+        self.handler_ro_execution_times.append((timestamp, message, time.perf_counter() - start))
 
 
     def cmd_conductivity_sensor_data_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
Index: leahi_dialin/fp/modules/events.py
===================================================================
diff -u -r820c94585ab5d85c40395e828c4dfe2da164c105 -r5c1132f5aadff6082afa56588ad1f4a64f828cd9
--- leahi_dialin/fp/modules/events.py	(.../events.py)	(revision 820c94585ab5d85c40395e828c4dfe2da164c105)
+++ leahi_dialin/fp/modules/events.py	(.../events.py)	(revision 5c1132f5aadff6082afa56588ad1f4a64f828cd9)
@@ -292,7 +292,7 @@
         # Update event dictionary
         self._event_dictionary[event_enum.name].append(event_tuple)
         self.events_timestamp = timestamp
-        self.handler_execution_times.append(time.perf_counter() - start)
+        self.handler_execution_times.append((timestamp, message, time.perf_counter() - start))
 
     @publish(["msg_id_fp_op_mode_data", "event_op_mode_timestamp", "op_mode", "sub_mode"])
     def _handler_fp_op_mode_sync(self, message, timestamp=0.0):
Index: leahi_dialin/fp/modules/flow_sensors.py
===================================================================
diff -u -r820c94585ab5d85c40395e828c4dfe2da164c105 -r5c1132f5aadff6082afa56588ad1f4a64f828cd9
--- leahi_dialin/fp/modules/flow_sensors.py	(.../flow_sensors.py)	(revision 820c94585ab5d85c40395e828c4dfe2da164c105)
+++ leahi_dialin/fp/modules/flow_sensors.py	(.../flow_sensors.py)	(revision 5c1132f5aadff6082afa56588ad1f4a64f828cd9)
@@ -76,7 +76,7 @@
                                decoder_list = sensor_list,
                                message = message)
         self.fp_flow_timestamp = timestamp
-        self.handler_execution_times.append(time.perf_counter() - start)
+        self.handler_execution_times.append((timestamp, message, time.perf_counter() - start))
 
 
     def cmd_flow_sensor_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
Index: leahi_dialin/fp/modules/levels.py
===================================================================
diff -u -r820c94585ab5d85c40395e828c4dfe2da164c105 -r5c1132f5aadff6082afa56588ad1f4a64f828cd9
--- leahi_dialin/fp/modules/levels.py	(.../levels.py)	(revision 820c94585ab5d85c40395e828c4dfe2da164c105)
+++ leahi_dialin/fp/modules/levels.py	(.../levels.py)	(revision 5c1132f5aadff6082afa56588ad1f4a64f828cd9)
@@ -77,7 +77,7 @@
                                decoder_list = sensor_list,
                                message = message)
         self.fp_levels_timestamp = timestamp
-        self.handler_execution_times.append(time.perf_counter() - start)
+        self.handler_execution_times.append((timestamp, message, time.perf_counter() - start))
 
 
     def cmd_levels_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
Index: leahi_dialin/fp/modules/permeate_tank.py
===================================================================
diff -u -r820c94585ab5d85c40395e828c4dfe2da164c105 -r5c1132f5aadff6082afa56588ad1f4a64f828cd9
--- leahi_dialin/fp/modules/permeate_tank.py	(.../permeate_tank.py)	(revision 820c94585ab5d85c40395e828c4dfe2da164c105)
+++ leahi_dialin/fp/modules/permeate_tank.py	(.../permeate_tank.py)	(revision 5c1132f5aadff6082afa56588ad1f4a64f828cd9)
@@ -68,7 +68,7 @@
         self.process_into_vars(decoder_list = msg_list,
                                message = message)
         self.permeate_tank_timestamp = timestamp
-        self.handler_execution_times.append(time.perf_counter() - start)
+        self.handler_execution_times.append((timestamp, message, time.perf_counter() - start))
 
 
     def cmd_permeate_tank_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
Index: leahi_dialin/fp/modules/pressure_sensors.py
===================================================================
diff -u -r820c94585ab5d85c40395e828c4dfe2da164c105 -r5c1132f5aadff6082afa56588ad1f4a64f828cd9
--- leahi_dialin/fp/modules/pressure_sensors.py	(.../pressure_sensors.py)	(revision 820c94585ab5d85c40395e828c4dfe2da164c105)
+++ leahi_dialin/fp/modules/pressure_sensors.py	(.../pressure_sensors.py)	(revision 5c1132f5aadff6082afa56588ad1f4a64f828cd9)
@@ -83,7 +83,7 @@
                                decoder_list = sensor_list,
                                message = message)
         self.fp_pressure_timestamp = timestamp
-        self.handler_execution_times.append(time.perf_counter() - start)
+        self.handler_execution_times.append((timestamp, message, time.perf_counter() - start))
 
 
     def cmd_pressure_sensors_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
Index: leahi_dialin/fp/modules/ro_pump.py
===================================================================
diff -u -r820c94585ab5d85c40395e828c4dfe2da164c105 -r5c1132f5aadff6082afa56588ad1f4a64f828cd9
--- leahi_dialin/fp/modules/ro_pump.py	(.../ro_pump.py)	(revision 820c94585ab5d85c40395e828c4dfe2da164c105)
+++ leahi_dialin/fp/modules/ro_pump.py	(.../ro_pump.py)	(revision 5c1132f5aadff6082afa56588ad1f4a64f828cd9)
@@ -92,7 +92,7 @@
                                decoder_list = sensor_list,
                                message = message)
         self.ro_pump_timestamp = timestamp
-        self.handler_execution_times.append(time.perf_counter() - start)
+        self.handler_execution_times.append((timestamp, message, time.perf_counter() - start))
 
 
     def cmd_ro_pump_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
Index: leahi_dialin/fp/modules/temperatures.py
===================================================================
diff -u -r820c94585ab5d85c40395e828c4dfe2da164c105 -r5c1132f5aadff6082afa56588ad1f4a64f828cd9
--- leahi_dialin/fp/modules/temperatures.py	(.../temperatures.py)	(revision 820c94585ab5d85c40395e828c4dfe2da164c105)
+++ leahi_dialin/fp/modules/temperatures.py	(.../temperatures.py)	(revision 5c1132f5aadff6082afa56588ad1f4a64f828cd9)
@@ -89,7 +89,7 @@
                                decoder_list = sensor_list,
                                message = message)
         self.fp_temperature_sensors_timestamp = timestamp
-        self.handler_execution_times.append(time.perf_counter() - start)
+        self.handler_execution_times.append((timestamp, message, time.perf_counter() - start))
 
 
     def cmd_temperatures_data_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
Index: leahi_dialin/fp/modules/valves.py
===================================================================
diff -u -r820c94585ab5d85c40395e828c4dfe2da164c105 -r5c1132f5aadff6082afa56588ad1f4a64f828cd9
--- leahi_dialin/fp/modules/valves.py	(.../valves.py)	(revision 820c94585ab5d85c40395e828c4dfe2da164c105)
+++ leahi_dialin/fp/modules/valves.py	(.../valves.py)	(revision 5c1132f5aadff6082afa56588ad1f4a64f828cd9)
@@ -164,7 +164,7 @@
             start = end
             end += 1
         self.fp_valves_states_timestamp = timestamp
-        self.handler_execution_times.append(time.perf_counter() - start)
+        self.handler_execution_times.append((timestamp, message, time.perf_counter() - start))
 
 
     def cmd_valve_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
Index: leahi_dialin/td/modules/air_pump.py
===================================================================
diff -u -r820c94585ab5d85c40395e828c4dfe2da164c105 -r5c1132f5aadff6082afa56588ad1f4a64f828cd9
--- leahi_dialin/td/modules/air_pump.py	(.../air_pump.py)	(revision 820c94585ab5d85c40395e828c4dfe2da164c105)
+++ leahi_dialin/td/modules/air_pump.py	(.../air_pump.py)	(revision 5c1132f5aadff6082afa56588ad1f4a64f828cd9)
@@ -89,7 +89,7 @@
                                decoder_list = sensor_list,
                                message = message)
         self.td_air_pump_timestamp = timestamp
-        self.handler_execution_times.append(time.perf_counter() - start)
+        self.handler_execution_times.append((timestamp, message, time.perf_counter() - start))
 
 
     def cmd_air_pump_data_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
Index: leahi_dialin/td/modules/air_trap.py
===================================================================
diff -u -r820c94585ab5d85c40395e828c4dfe2da164c105 -r5c1132f5aadff6082afa56588ad1f4a64f828cd9
--- leahi_dialin/td/modules/air_trap.py	(.../air_trap.py)	(revision 820c94585ab5d85c40395e828c4dfe2da164c105)
+++ leahi_dialin/td/modules/air_trap.py	(.../air_trap.py)	(revision 5c1132f5aadff6082afa56588ad1f4a64f828cd9)
@@ -120,7 +120,7 @@
                                message = message,
                                start_from_byte = (len(sensor_list_1) + len(sensor_list_2)) * DataTypes.U32.size())
         self.td_air_trap_timestamp = timestamp
-        self.handler_execution_times.append(time.perf_counter() - start)
+        self.handler_execution_times.append((timestamp, message, time.perf_counter() - start))
 
 
     def cmd_air_trap_data_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
Index: leahi_dialin/td/modules/alarms.py
===================================================================
diff -u -r820c94585ab5d85c40395e828c4dfe2da164c105 -r5c1132f5aadff6082afa56588ad1f4a64f828cd9
--- leahi_dialin/td/modules/alarms.py	(.../alarms.py)	(revision 820c94585ab5d85c40395e828c4dfe2da164c105)
+++ leahi_dialin/td/modules/alarms.py	(.../alarms.py)	(revision 5c1132f5aadff6082afa56588ad1f4a64f828cd9)
@@ -390,7 +390,7 @@
                 self.alarm_table[result['Alarm_Id']][prop] = result[prop]
 
         self.alarm_table_timestamp = timestamp
-        self.handler_clr_execution_times.append(time.perf_counter() - start)
+        self.handler_clr_execution_times.append((timestamp, message, time.perf_counter() - start))
 
 
     def cmd_alarm_status_broadcast_interval_override(self, ms: int = 250, reset: int = NO_RESET):
Index: leahi_dialin/td/modules/blood_flow.py
===================================================================
diff -u -r820c94585ab5d85c40395e828c4dfe2da164c105 -r5c1132f5aadff6082afa56588ad1f4a64f828cd9
--- leahi_dialin/td/modules/blood_flow.py	(.../blood_flow.py)	(revision 820c94585ab5d85c40395e828c4dfe2da164c105)
+++ leahi_dialin/td/modules/blood_flow.py	(.../blood_flow.py)	(revision 5c1132f5aadff6082afa56588ad1f4a64f828cd9)
@@ -91,7 +91,7 @@
                                decoder_list = sensor_list,
                                message = message)
         self.td_blood_flow_timestamp = timestamp
-        self.handler_execution_times.append(time.perf_counter() - start)
+        self.handler_execution_times.append((timestamp, message, time.perf_counter() - start))
 
 
     def cmd_blood_flow_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
Index: leahi_dialin/td/modules/bubble_detector.py
===================================================================
diff -u -r820c94585ab5d85c40395e828c4dfe2da164c105 -r5c1132f5aadff6082afa56588ad1f4a64f828cd9
--- leahi_dialin/td/modules/bubble_detector.py	(.../bubble_detector.py)	(revision 820c94585ab5d85c40395e828c4dfe2da164c105)
+++ leahi_dialin/td/modules/bubble_detector.py	(.../bubble_detector.py)	(revision 5c1132f5aadff6082afa56588ad1f4a64f828cd9)
@@ -91,7 +91,7 @@
                                decoder_list = sensor_list,
                                message = message)
         self.td_air_bubbles_timestamp = timestamp
-        self.handler_execution_times.append(time.perf_counter() - start)
+        self.handler_execution_times.append((timestamp, message, time.perf_counter() - start))
 
 
     def cmd_air_bubbles_data_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
Index: leahi_dialin/td/modules/buttons.py
===================================================================
diff -u -r820c94585ab5d85c40395e828c4dfe2da164c105 -r5c1132f5aadff6082afa56588ad1f4a64f828cd9
--- leahi_dialin/td/modules/buttons.py	(.../buttons.py)	(revision 820c94585ab5d85c40395e828c4dfe2da164c105)
+++ leahi_dialin/td/modules/buttons.py	(.../buttons.py)	(revision 5c1132f5aadff6082afa56588ad1f4a64f828cd9)
@@ -84,7 +84,7 @@
         if len(mode) > 0:
             self.poweroff_timeout_expired = bool(mode[0])
         self.td_power_off_timestamp = timestamp
-        self.handler_execution_times.append(time.perf_counter() - start)
+        self.handler_execution_times.append((timestamp, message, time.perf_counter() - start))
 
 
     def cmd_off_button_override(self, state: int, reset: int = NO_RESET) -> int:
Index: leahi_dialin/td/modules/ejector.py
===================================================================
diff -u -r820c94585ab5d85c40395e828c4dfe2da164c105 -r5c1132f5aadff6082afa56588ad1f4a64f828cd9
--- leahi_dialin/td/modules/ejector.py	(.../ejector.py)	(revision 820c94585ab5d85c40395e828c4dfe2da164c105)
+++ leahi_dialin/td/modules/ejector.py	(.../ejector.py)	(revision 5c1132f5aadff6082afa56588ad1f4a64f828cd9)
@@ -83,7 +83,7 @@
                                decoder_list = sensor_list,
                                message = message)
         self.td_ejector_timestamp = timestamp
-        self.handler_execution_times.append(time.perf_counter() - start)
+        self.handler_execution_times.append((timestamp, message, time.perf_counter() - start))
 
 
     def cmd_ejector_data_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
Index: leahi_dialin/td/modules/events.py
===================================================================
diff -u -r820c94585ab5d85c40395e828c4dfe2da164c105 -r5c1132f5aadff6082afa56588ad1f4a64f828cd9
--- leahi_dialin/td/modules/events.py	(.../events.py)	(revision 820c94585ab5d85c40395e828c4dfe2da164c105)
+++ leahi_dialin/td/modules/events.py	(.../events.py)	(revision 5c1132f5aadff6082afa56588ad1f4a64f828cd9)
@@ -17,7 +17,7 @@
 import struct
 from logging import Logger
 from datetime import datetime
-from time import time
+import time
 # Module imports
 from logging import Logger
 
@@ -286,7 +286,7 @@
         # Update event dictionary
         self._event_dictionary[event_enum.name].append(event_tuple)
         self.events_timestamp = timestamp
-        self.handler_execution_times.append(time.perf_counter() - start)
+        self.handler_execution_times.append((timestamp, message, time.perf_counter() - start))
 
 
     @publish(["msg_id_td_op_mode_data", "event_op_mode_timestamp", "op_mode", "sub_mode"])
Index: leahi_dialin/td/modules/pressure_sensors.py
===================================================================
diff -u -r820c94585ab5d85c40395e828c4dfe2da164c105 -r5c1132f5aadff6082afa56588ad1f4a64f828cd9
--- leahi_dialin/td/modules/pressure_sensors.py	(.../pressure_sensors.py)	(revision 820c94585ab5d85c40395e828c4dfe2da164c105)
+++ leahi_dialin/td/modules/pressure_sensors.py	(.../pressure_sensors.py)	(revision 5c1132f5aadff6082afa56588ad1f4a64f828cd9)
@@ -131,7 +131,7 @@
                                start_from_byte = (len(sensor_list_1) + len(msg_list_1)) * DataTypes.F32.size())
 
         self.td_pressure_timestamp = timestamp
-        self.handler_execution_times.append(time.perf_counter() - start)
+        self.handler_execution_times.append((timestamp, message, time.perf_counter() - start))
 
 
     def cmd_pressure_sensors_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
Index: leahi_dialin/td/modules/switches.py
===================================================================
diff -u -r820c94585ab5d85c40395e828c4dfe2da164c105 -r5c1132f5aadff6082afa56588ad1f4a64f828cd9
--- leahi_dialin/td/modules/switches.py	(.../switches.py)	(revision 820c94585ab5d85c40395e828c4dfe2da164c105)
+++ leahi_dialin/td/modules/switches.py	(.../switches.py)	(revision 5c1132f5aadff6082afa56588ad1f4a64f828cd9)
@@ -72,7 +72,7 @@
                                decoder_list = sensor_list,
                                message = message)
         self.td_switches_timestamp = timestamp
-        self.handler_execution_times.append(time.perf_counter() - start)
+        self.handler_execution_times.append((timestamp, message, time.perf_counter() - start))
 
 
     def cmd_switches_data_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
Index: leahi_dialin/td/modules/syringe_pump.py
===================================================================
diff -u -r820c94585ab5d85c40395e828c4dfe2da164c105 -r5c1132f5aadff6082afa56588ad1f4a64f828cd9
--- leahi_dialin/td/modules/syringe_pump.py	(.../syringe_pump.py)	(revision 820c94585ab5d85c40395e828c4dfe2da164c105)
+++ leahi_dialin/td/modules/syringe_pump.py	(.../syringe_pump.py)	(revision 5c1132f5aadff6082afa56588ad1f4a64f828cd9)
@@ -103,7 +103,7 @@
                                message = message)
 
         self.td_syringe_pump_timestamp = timestamp
-        self.handler_execution_times.append(time.perf_counter() - start)
+        self.handler_execution_times.append((timestamp, message, time.perf_counter() - start))
 
     def cmd_syringe_pump_operation(self, operation: int = SyringePumpOperations.SYRINGE_PUMP_OP_STOP.value,
                                    rate: float = 0.0,
Index: leahi_dialin/td/modules/temperature_sensors.py
===================================================================
diff -u -r820c94585ab5d85c40395e828c4dfe2da164c105 -r5c1132f5aadff6082afa56588ad1f4a64f828cd9
--- leahi_dialin/td/modules/temperature_sensors.py	(.../temperature_sensors.py)	(revision 820c94585ab5d85c40395e828c4dfe2da164c105)
+++ leahi_dialin/td/modules/temperature_sensors.py	(.../temperature_sensors.py)	(revision 5c1132f5aadff6082afa56588ad1f4a64f828cd9)
@@ -76,7 +76,7 @@
                                decoder_list = sensor_list,
                                message = message)
         self.td_temperature_timestamp = timestamp
-        self.handler_execution_times.append(time.perf_counter() - start)
+        self.handler_execution_times.append((timestamp, message, time.perf_counter() - start))
 
 
     def cmd_temperature_sensors_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
Index: leahi_dialin/td/modules/treatment.py
===================================================================
diff -u -r820c94585ab5d85c40395e828c4dfe2da164c105 -r5c1132f5aadff6082afa56588ad1f4a64f828cd9
--- leahi_dialin/td/modules/treatment.py	(.../treatment.py)	(revision 820c94585ab5d85c40395e828c4dfe2da164c105)
+++ leahi_dialin/td/modules/treatment.py	(.../treatment.py)	(revision 5c1132f5aadff6082afa56588ad1f4a64f828cd9)
@@ -154,7 +154,7 @@
         self.process_into_vars(decoder_list = msg_list,
                                message = message)
         self.tx_params_timestamp = timestamp
-        self.handler_execution_times.append(time.perf_counter() - start)
+        self.handler_execution_times.append((timestamp, message, time.perf_counter() - start))
 
 
     @publish(["msg_id_td_saline_bolus_data", "tgt_saline_volume","cum_saline_volume","bol_saline_volume",
Index: leahi_dialin/td/modules/valves.py
===================================================================
diff -u -r820c94585ab5d85c40395e828c4dfe2da164c105 -r5c1132f5aadff6082afa56588ad1f4a64f828cd9
--- leahi_dialin/td/modules/valves.py	(.../valves.py)	(revision 820c94585ab5d85c40395e828c4dfe2da164c105)
+++ leahi_dialin/td/modules/valves.py	(.../valves.py)	(revision 5c1132f5aadff6082afa56588ad1f4a64f828cd9)
@@ -93,7 +93,7 @@
             # Update the valves dictionary
             self.valves_status[result['Valve']] = result
         self.td_valves_timestamp = timestamp
-        self.handler_execution_times.append(time.perf_counter() - start)
+        self.handler_execution_times.append((timestamp, message, time.perf_counter() - start))
 
 
     def cmd_valves_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int:
Index: leahi_dialin/td/modules/voltages.py
===================================================================
diff -u -r820c94585ab5d85c40395e828c4dfe2da164c105 -r5c1132f5aadff6082afa56588ad1f4a64f828cd9
--- leahi_dialin/td/modules/voltages.py	(.../voltages.py)	(revision 820c94585ab5d85c40395e828c4dfe2da164c105)
+++ leahi_dialin/td/modules/voltages.py	(.../voltages.py)	(revision 5c1132f5aadff6082afa56588ad1f4a64f828cd9)
@@ -82,7 +82,7 @@
                                decoder_list = sensor_list,
                                message = message)
         self.td_voltages_timestamp = timestamp
-        self.handler_execution_times.append(time.perf_counter() - start)
+        self.handler_execution_times.append((timestamp, message, time.perf_counter() - start))
 
 
     def cmd_monitored_voltages_broadcast_interval_override(self, ms: int = 1000, reset: int = NO_RESET) -> int: