diff --git a/nibe/data/smos40.csv b/nibe/data/smos40.csv
index 7b85149..29930f7 100755
--- a/nibe/data/smos40.csv
+++ b/nibe/data/smos40.csv
@@ -15,7 +15,7 @@ Temperature limiter (EB100-FD1)	MODBUS_INPUT_REGISTER	36	1		s16	0	0	0
 Average temperature (BT1)	MODBUS_INPUT_REGISTER	37	10	°C	s16	0	0	0
 Boiler temperature (BT52)	MODBUS_INPUT_REGISTER	38	10	°C	s16	0	0	0
 External supply line (BT25)	MODBUS_INPUT_REGISTER	39	10	°C	s16	0	0	0
-Flow sensor (BF1)	MODBUS_INPUT_REGISTER	40	10	l/m	s16	0	0	0
+Flow sensor (BF1)	MODBUS_INPUT_REGISTER	40	10	l/min	s16	0	0	0
 Electrical anode (EB100-FR1)	MODBUS_INPUT_REGISTER	41	1		s16	0	0	0
 Supp. air (AZ30-BT22)	MODBUS_INPUT_REGISTER	42	10	°C	s16	0	0	0
 Current (BE3)	MODBUS_INPUT_REGISTER	46	10	A	u32	0	0	0
@@ -128,10 +128,10 @@ Compressor, total time pool 2, heat pump 2 (EP14)	MODBUS_INPUT_REGISTER	259	1	h
 Compressor, total time cooling, heat pump 1 (EP15)	MODBUS_INPUT_REGISTER	261	1	h	u32	0	0	0
 Compressor, total time pool, heat pump 1 (EP15)	MODBUS_INPUT_REGISTER	263	1	h	u32	0	0	0
 Compressor, total time pool 2, heat pump 1 (EP15)	MODBUS_INPUT_REGISTER	265	1	h	u32	0	0	0
-Compressor, total time cooling, heat pump 1 (EP14)	MODBUS_INPUT_REGISTER	267	1	h	u32	0	2147483647	0
-Compressor, total time pool, heat pump 1 (EP14)	MODBUS_INPUT_REGISTER	269	1	h	u32	0	2147483647	0
-Compressor, total time pool 2, heat pump 1 (EP14)	MODBUS_INPUT_REGISTER	271	1	h	u32	0	2147483647	0
-Compressor, total time cooling, main unit (EP14)	MODBUS_INPUT_REGISTER	279	1	h	u32	0	2147483647	0
+Compressor, total time cooling, heat pump 1 (EP14)	MODBUS_INPUT_REGISTER	267	1	h	u32	-2147483648	2147483647	0
+Compressor, total time pool, heat pump 1 (EP14)	MODBUS_INPUT_REGISTER	269	1	h	u32	-2147483648	2147483647	0
+Compressor, total time pool 2, heat pump 1 (EP14)	MODBUS_INPUT_REGISTER	271	1	h	u32	-2147483648	2147483647	0
+Total run time compressor cooling	MODBUS_INPUT_REGISTER	279	1	h	u32	0	2147483647	0
 Compressor, total time pool, main unit (EP14)	MODBUS_INPUT_REGISTER	281	1	h	u32	0	2147483647	0
 Compressor, total time pool 2, main unit (EP14)	MODBUS_INPUT_REGISTER	283	1	h	u32	0	2147483647	0
 Total run time external HW additional heat	MODBUS_INPUT_REGISTER	285	10	h	s32	0	9999999	0
@@ -508,7 +508,7 @@ Oper. mode shunt climate system 2	MODBUS_INPUT_REGISTER	1032	1		u8	0	0	0
 Oper. mode shunt climate system 1	MODBUS_INPUT_REGISTER	1033	1		u8	0	0	0
 Operating. mode shunt controlled additional heat	MODBUS_INPUT_REGISTER	1034	1		u8	0	0	0
 Fan mode 1	MODBUS_INPUT_REGISTER	1037	1	%	u8	0	0	0
-Current hot water mode	MODBUS_INPUT_REGISTER	1038	1		s8	0	0	0
+Current hot water mode without SPA/SC	MODBUS_INPUT_REGISTER	1038	1		s8	0	0	0
 Blocking cooling	MODBUS_INPUT_REGISTER	1053	1		u8	0	0	0
 External adjustment climate system 4	MODBUS_INPUT_REGISTER	1054	1		u8	0	0	0
 External adjustment climate system 3	MODBUS_INPUT_REGISTER	1055	1		u8	0	0	0
@@ -528,8 +528,8 @@ Holiday function status	MODBUS_HOLDING_REGISTER	19	1		s8	0	0	0
 Docked compressors heating	MODBUS_INPUT_REGISTER	1108	1		u8	0	0	0
 Docked compressors hot water	MODBUS_INPUT_REGISTER	1109	1		u8	0	0	0
 Docked compressors pool 1	MODBUS_INPUT_REGISTER	1110	1		u8	0	0	0
-Reversing valve hot water (QN10)	MODBUS_INPUT_REGISTER	2196	1		u8	0	0	0
 Relay status, base board (EB100-EP14)	MODBUS_INPUT_REGISTER	1117	1		u8	0	0	0
+Diverter valve hot water (QN10)	MODBUS_INPUT_REGISTER	2196	1		u8	0	0	0
 Relay status, imm. heat. board (EB100-EP14)	MODBUS_INPUT_REGISTER	1119	1		u16	0	0	0
 Current status	MODBUS_INPUT_REGISTER	1120	1		u32	0	0	0
 Functionality, heat pump (EP14)	MODBUS_INPUT_REGISTER	1122	1		u32	0	0	0
@@ -561,7 +561,7 @@ Version (EB101)	MODBUS_INPUT_REGISTER	1451	1		u16	0	0	0
 Heat pump type (EB101)	MODBUS_INPUT_REGISTER	1452	1		u8	0	0	0
 Compressor size (EB101)	MODBUS_INPUT_REGISTER	1453	1		u8	0	0	0
 Return line (EB101-BT3)	MODBUS_INPUT_REGISTER	1475	10	°C	s16	0	0	0
-Condenser sensor, supply line (EB101-BT12)	MODBUS_INPUT_REGISTER	1478	10	°C	s16	0	0	0
+Condenser sensor supply line (EB101-BT12)	MODBUS_INPUT_REGISTER	1478	10	°C	s16	0	0	0
 Discharge (EB101-BT14)	MODBUS_INPUT_REGISTER	1479	10	°C	s16	0	0	0
 Liquid line (EB101-BT15)	MODBUS_INPUT_REGISTER	1480	10	°C	s16	0	0	0
 Suction gas (EB101-BT17)	MODBUS_INPUT_REGISTER	1481	10	°C	s16	0	0	0
@@ -570,8 +570,8 @@ Compressor status (EB101)	MODBUS_INPUT_REGISTER	1484	1		u8	0	0	0
 Compressor, time to start (EB101-EP14)	MODBUS_INPUT_REGISTER	1485	1	min	u8	0	0	0
 Relay status (EB101-EP14)	MODBUS_INPUT_REGISTER	1486	1		u16	0	0	0
 Compressor, number of starts (EB101-EP14)	MODBUS_INPUT_REGISTER	1489	1		u32	0	2147483647	0
-Compressor, oper. time, total (EB101-EP14)	MODBUS_INPUT_REGISTER	1491	1	h	u32	0	2147483647	0
-Compressor, oper. time, hot water (EB101-EP14)	MODBUS_INPUT_REGISTER	1493	1	h	u32	0	2147483647	0
+Compressor, oper. time, total (EB101-EP14)	MODBUS_INPUT_REGISTER	1491	1	h	u32	-2147483648	2147483647	0
+Compressor, oper. time, hot water (EB101-EP14)	MODBUS_INPUT_REGISTER	1493	1	h	u32	-2147483648	2147483647	0
 Alarm number (EB101-EP14)	MODBUS_INPUT_REGISTER	1495	1		u16	0	0	0
 Version (EB100)	MODBUS_INPUT_REGISTER	1496	1		u16	0	0	0
 Heat pump type (EB100)	MODBUS_INPUT_REGISTER	1497	1		u8	0	0	0
@@ -744,15 +744,15 @@ Operating mode, shunt controlled brine (QN41)	MODBUS_INPUT_REGISTER	2410	1		u8	0
 Low press. sensor, unprocessed (EB102-EP14)	MODBUS_INPUT_REGISTER	1896	1		s16	0	0	0
 Current sensor (EB102-EP14)	MODBUS_INPUT_REGISTER	1897	10	A	s16	0	0	0
 Low press. sensor, unprocessed (EB101-EP14)	MODBUS_INPUT_REGISTER	1902	1		s16	0	0	0
-Current sensor (EB101-EP14)	MODBUS_INPUT_REGISTER	1903	10	A	s16	0	0	0
+Current (EB101-EP14)	MODBUS_INPUT_REGISTER	1903	10	A	s16	0	0	0
 Low press. sensor, unprocessed (EB100-EP15)	MODBUS_INPUT_REGISTER	1905	1		s16	0	0	0
-Current sensor (EB100-EP15)	MODBUS_INPUT_REGISTER	1906	10	A	s16	0	0	0
+Current (EB100-EP15)	MODBUS_INPUT_REGISTER	1906	10	A	s16	0	0	0
 Low press. sensor, unprocessed (EB100-EP14)	MODBUS_INPUT_REGISTER	1908	1		s16	0	0	0
-Current sensor (EB100-EP14)	MODBUS_INPUT_REGISTER	1909	10	A	s16	0	0	0
+Current (EB100-EP14)	MODBUS_INPUT_REGISTER	1909	10	A	s16	0	0	0
 Operating mode (SG Ready)	MODBUS_INPUT_REGISTER	1911	1		u8	0	0	0
 SG ready, input A	MODBUS_INPUT_REGISTER	1912	1		u8	0	0	0
 SG ready, input B	MODBUS_INPUT_REGISTER	1913	1		u8	0	0	0
-Hot water comfort mode (SPA)	MODBUS_INPUT_REGISTER	1915	1		s8	0	0	0
+Hot water mode (SPA)	MODBUS_INPUT_REGISTER	1915	1		s8	0	0	0
 Pool offset (SPA)	MODBUS_INPUT_REGISTER	1916	1		s8	0	0	0
 Cooling offset (SPA)	MODBUS_INPUT_REGISTER	1917	1		s8	0	0	0
 Operating mode (Smart Price Adaption)	MODBUS_INPUT_REGISTER	1918	1		u8	0	0	0
@@ -792,7 +792,7 @@ External adjustment climate system 2	MODBUS_HOLDING_REGISTER	50	1		s8	-10	10	0
 External adjustment climate system 1	MODBUS_HOLDING_REGISTER	51	1		s8	-10	10	0
 External adjustment with room sensor climate system 2	MODBUS_HOLDING_REGISTER	54	10	°C	s16	50	300	200
 External adjustment with room sensor climate system 1	MODBUS_HOLDING_REGISTER	55	10	°C	s16	50	300	200
-Hot water demand mode	MODBUS_HOLDING_REGISTER	56	1		s8	0	4	1
+Hot water mode	MODBUS_HOLDING_REGISTER	56	1		s8	0	4	1
 Start temperature HW high temperature	MODBUS_HOLDING_REGISTER	58	10	°C	s16	50	700	490
 Start temperature HW normal temperature	MODBUS_HOLDING_REGISTER	59	10	°C	s16	50	600	460
 Start temperature HW low temperature	MODBUS_HOLDING_REGISTER	60	10	°C	s16	50	550	420
@@ -884,12 +884,12 @@ Room sensor factor climate system 4	MODBUS_HOLDING_REGISTER	207	10		u8	0	60	20
 Room sensor factor climate system 3	MODBUS_HOLDING_REGISTER	208	10		u8	0	60	20
 Room sensor factor climate system 2	MODBUS_HOLDING_REGISTER	209	10		u8	0	60	20
 Room sensor factor climate system 1	MODBUS_HOLDING_REGISTER	210	10		u8	0	60	20
-Input AUX5	MODBUS_HOLDING_REGISTER	211	1		u8	0	68	0
-Input AUX4	MODBUS_HOLDING_REGISTER	212	1		u8	0	68	0
-Input AUX3	MODBUS_HOLDING_REGISTER	213	1		u8	0	68	0
-Input AUX2	MODBUS_HOLDING_REGISTER	214	1		u8	0	68	0
-Input AUX1	MODBUS_HOLDING_REGISTER	215	1		u8	0	68	0
-Output AUX1	MODBUS_HOLDING_REGISTER	216	1		u8	0	30	0
+Input AUX5	MODBUS_HOLDING_REGISTER	211	1		u8	0	69	0
+Input AUX4	MODBUS_HOLDING_REGISTER	212	1		u8	0	69	0
+Input AUX3	MODBUS_HOLDING_REGISTER	213	1		u8	0	69	0
+Input AUX2	MODBUS_HOLDING_REGISTER	214	1		u8	0	69	0
+Input AUX1	MODBUS_HOLDING_REGISTER	215	1		u8	0	69	0
+Output AUX1	MODBUS_HOLDING_REGISTER	216	1		u8	0	32	0
 Speed, brine pump	MODBUS_HOLDING_REGISTER	222	1	%	u8	1	100	100
 id:3968	MODBUS_HOLDING_REGISTER	2752	1		u16	1	3600	5
 Preset flow setting for climate system	MODBUS_HOLDING_REGISTER	223	1		u8	0	3	1
@@ -934,7 +934,7 @@ id:4660	MODBUS_HOLDING_REGISTER	5267	1		u8	0	0	0
 Shunted brine, accessory	MODBUS_HOLDING_REGISTER	5268	1		u8	0	1	0
 Shunted brine max. temp.	MODBUS_HOLDING_REGISTER	5271	1	°C	u8	0	30	20
 Hot water compressors step diff.	MODBUS_HOLDING_REGISTER	755	100		s16	0	400	100
-Additional heat after reversing valve	MODBUS_HOLDING_REGISTER	758	1		u8	0	1	1
+Additional heat after diverter valve	MODBUS_HOLDING_REGISTER	758	1		u8	0	1	1
 Hot water additional heat in tank	MODBUS_HOLDING_REGISTER	759	1		u8	0	1	0
 Heating (SG Ready)	MODBUS_HOLDING_REGISTER	760	1		u8	0	1	1
 Cooling (SG Ready)	MODBUS_HOLDING_REGISTER	761	1		u8	0	1	1
@@ -947,7 +947,7 @@ id:4707	MODBUS_HOLDING_REGISTER	5276	1		u8	0	1	0
 id:4708	MODBUS_HOLDING_REGISTER	5277	1		u8	0	1	0
 id:4709	MODBUS_HOLDING_REGISTER	5278	1		u8	0	1	0
 id:4710	MODBUS_HOLDING_REGISTER	5279	1		u8	0	1	0
-Input AUX6	MODBUS_HOLDING_REGISTER	767	1		u8	0	68	0
+Input AUX6	MODBUS_HOLDING_REGISTER	767	1		u8	0	69	0
 Operating mode circulation pump heating heat pump 2	MODBUS_HOLDING_REGISTER	782	1		u8	0	1	1
 Operating mode circulation pump heating heat pump 1	MODBUS_HOLDING_REGISTER	783	1		u8	0	1	1
 Operating mode circulation pump hot water heat pump 2	MODBUS_HOLDING_REGISTER	798	1		u8	0	1	1
@@ -1075,13 +1075,13 @@ Smart home room control	MODBUS_HOLDING_REGISTER	1102	1		u8	0	1	0
 Smart Energy Source	MODBUS_HOLDING_REGISTER	1105	1		u8	0	1	0
 Control method, smart energy source	MODBUS_HOLDING_REGISTER	1106	1		u8	0	1	0
 El. price, special, smart energy source	MODBUS_HOLDING_REGISTER	1107	1		u8	0	2	0
-El. price, fixed, smart energy source	MODBUS_HOLDING_REGISTER	1108	1		u16	0	10000	100
+El. price, fixed, smart energy source	MODBUS_HOLDING_REGISTER	1108	1		u16	0	60000	100
 El. price, smart energy source	MODBUS_HOLDING_REGISTER	1109	1		u8	0	1	0
-El. price, fixed, smart energy source	MODBUS_HOLDING_REGISTER	1110	1		u16	0	10000	100
+El. price, fixed, smart energy source	MODBUS_HOLDING_REGISTER	1110	1		u16	0	60000	100
 El. price, smart energy source	MODBUS_HOLDING_REGISTER	1111	1		u8	0	3	0
-El. price, fixed, smart energy source	MODBUS_HOLDING_REGISTER	1112	1		u16	0	10000	100
+El. price, fixed, smart energy source	MODBUS_HOLDING_REGISTER	1112	1		u16	0	60000	100
 El. price, smart energy source	MODBUS_HOLDING_REGISTER	1113	1		u8	0	1	0
-El. price, fixed, smart energy source	MODBUS_HOLDING_REGISTER	1114	1		u16	0	10000	100
+El. price, fixed, smart energy source	MODBUS_HOLDING_REGISTER	1114	1		u16	0	60000	100
 El. price, smart energy source	MODBUS_HOLDING_REGISTER	1115	1		u8	0	1	0
 El. price, fixed, smart energy source	MODBUS_HOLDING_REGISTER	1116	1		u16	0	10000	100
 Prim. factor, smart energy source	MODBUS_HOLDING_REGISTER	1117	10		u8	0	50	25
@@ -1090,14 +1090,14 @@ Prim. factor, ext. step add. heat smart energy source	MODBUS_HOLDING_REGISTER	11
 Prim. factor, OPT10 smart energy source	MODBUS_HOLDING_REGISTER	1120	10		u8	0	50	10
 OPT10, high tariff price smart energy source	MODBUS_HOLDING_REGISTER	1121	1		u16	1	10000	100
 OPT10, low tariff price smart energy source	MODBUS_HOLDING_REGISTER	1122	1		u16	1	10000	100
-ext. step add. heat, high tariff price smart energy source	MODBUS_HOLDING_REGISTER	1123	1		u16	1	10000	100
-ext. step add. heat, low tariff price smart energy source	MODBUS_HOLDING_REGISTER	1124	1		u16	1	10000	100
-Shunt add. heat, high tariff price smart energy source	MODBUS_HOLDING_REGISTER	1125	1		u16	1	10000	100
-Shunt add. heat, low tariff price smart energy source	MODBUS_HOLDING_REGISTER	1126	1		u16	1	10000	100
-El. price, fixed, high tariff smart energy source	MODBUS_HOLDING_REGISTER	1127	1		u16	1	10000	100
-El. price, fixed, low tariff smart energy source	MODBUS_HOLDING_REGISTER	1128	1		u16	1	10000	100
-El. price, variable, high tariff smart energy source	MODBUS_HOLDING_REGISTER	1129	1		u16	1	10000	100
-El. price, variable, low tariff smart energy source	MODBUS_HOLDING_REGISTER	1130	1		u16	1	10000	100
+ext. step add. heat, high tariff price smart energy source	MODBUS_HOLDING_REGISTER	1123	1		u16	1	60000	100
+ext. step add. heat, low tariff price smart energy source	MODBUS_HOLDING_REGISTER	1124	1		u16	1	60000	100
+Shunt add. heat, high tariff price smart energy source	MODBUS_HOLDING_REGISTER	1125	1		u16	1	60000	100
+Shunt add. heat, low tariff price smart energy source	MODBUS_HOLDING_REGISTER	1126	1		u16	1	60000	100
+El. price, fixed, high tariff smart energy source	MODBUS_HOLDING_REGISTER	1127	1		u16	1	60000	100
+El. price, fixed, low tariff smart energy source	MODBUS_HOLDING_REGISTER	1128	1		u16	1	60000	100
+El. price, variable, high tariff smart energy source	MODBUS_HOLDING_REGISTER	1129	1		u16	1	60000	100
+El. price, variable, low tariff smart energy source	MODBUS_HOLDING_REGISTER	1130	1		u16	1	60000	100
 DM start source, priority 5 smart energy source	MODBUS_HOLDING_REGISTER	1131	1		s16	100	2000	400
 DM start source, priority 4 smart energy source	MODBUS_HOLDING_REGISTER	1132	1		s16	100	2000	400
 DM start source, priority 3 smart energy source	MODBUS_HOLDING_REGISTER	1133	1		s16	100	2000	400
@@ -1139,6 +1139,7 @@ id:6029	MODBUS_INPUT_REGISTER	1994	1		u16	0	0	0
 Total average power (Solar PV)	MODBUS_INPUT_REGISTER	2178	100	kW	u32	0	0	0
 Total energy	MODBUS_INPUT_REGISTER	2180	10	kWh	s32	0	0	0
 Mode, energy meter (BE6)	MODBUS_HOLDING_REGISTER	4015	1		u8	0	255	255
+Mode, energy meter (BE7)	MODBUS_HOLDING_REGISTER	4016	1		u8	0	255	255
 ERS 2	MODBUS_HOLDING_REGISTER	4076	1		u8	0	1	0
 ERS 3	MODBUS_HOLDING_REGISTER	4077	1		u8	0	1	0
 ERS 4	MODBUS_HOLDING_REGISTER	4078	1		u8	0	1	0
@@ -1149,6 +1150,8 @@ id:6486	MODBUS_HOLDING_REGISTER	4135	1		u8	0	1	0
 id:6756	MODBUS_INPUT_REGISTER	2004	10	%RH	s16	0	0	0
 id:6757	MODBUS_INPUT_REGISTER	2005	10	%RH	s16	0	0	0
 id:6758	MODBUS_INPUT_REGISTER	2006	10	%RH	s16	0	0	0
+Mode, energy meter (BE11)	MODBUS_HOLDING_REGISTER	4127	1		u8	0	255	255
+External addition steps active	MODBUS_INPUT_REGISTER	2454	1		u8	0	0	0
 HTS 2	MODBUS_HOLDING_REGISTER	1981	1		u8	0	1	0
 HTS 3	MODBUS_HOLDING_REGISTER	1982	1		u8	0	1	0
 HTS 4	MODBUS_HOLDING_REGISTER	1983	1		u8	0	1	0
@@ -1226,7 +1229,7 @@ id:7943	MODBUS_INPUT_REGISTER	2399	10	%	u16	0	0	0
 id:7944	MODBUS_INPUT_REGISTER	2400	10	%	u16	0	0	0
 id:8002	MODBUS_HOLDING_REGISTER	1996	1	%	s8	-15	10	-3
 id:8003	MODBUS_HOLDING_REGISTER	1997	1	%	u8	1	254	65
-Minimum permitted speed (EB101 GP12)	MODBUS_HOLDING_REGISTER	5352	1	%	u8	1	50	1
+Minimum permitted speed (EB101 GP12)	MODBUS_HOLDING_REGISTER	5352	1	%	u8	1	50	0
 Minimum permitted speed (EB102 GP12)	MODBUS_HOLDING_REGISTER	5353	1	%	u8	1	50	1
 Start fan de-icing (EB101)	MODBUS_HOLDING_REGISTER	5360	1		s8	0	1	0
 Start fan de-icing (EB102)	MODBUS_HOLDING_REGISTER	5361	1		s8	0	1	0
@@ -1238,12 +1241,12 @@ System 1 (RMU)	MODBUS_HOLDING_REGISTER	176	1		u8	0	1	0
 System 2 (RMU)	MODBUS_HOLDING_REGISTER	177	1		u8	0	1	0
 System 3 (RMU)	MODBUS_HOLDING_REGISTER	178	1		u8	0	1	0
 System 4 (RMU)	MODBUS_HOLDING_REGISTER	179	1		u8	0	1	0
-System 4 (RMU)	MODBUS_HOLDING_REGISTER	1998	1		u8	0	1	0
-System 4 (RMU)	MODBUS_HOLDING_REGISTER	1999	1		u8	0	1	0
-System 4 (RMU)	MODBUS_HOLDING_REGISTER	2000	1		u8	0	1	0
-System 4 (RMU)	MODBUS_HOLDING_REGISTER	2001	1		u8	0	1	0
+System 5 (RMU)	MODBUS_HOLDING_REGISTER	1998	1		u8	0	1	0
+System 6 (RMU)	MODBUS_HOLDING_REGISTER	1999	1		u8	0	1	0
+System 7 (RMU)	MODBUS_HOLDING_REGISTER	2000	1		u8	0	1	0
+System 8 (RMU)	MODBUS_HOLDING_REGISTER	2001	1		u8	0	1	0
 id:8302	MODBUS_HOLDING_REGISTER	5388	1		u8	0	0	0
-id:8982	MODBUS_HOLDING_REGISTER	5390	1		u8	0	0	0
+Away mode status	MODBUS_HOLDING_REGISTER	5390	1		u8	0	0	0
 The start guide has been run	MODBUS_HOLDING_REGISTER	2742	1		u8	0	1	1
 Audio signal on alarm	MODBUS_HOLDING_REGISTER	5326	1		u8	0	1	1
 Sound when pressing button	MODBUS_HOLDING_REGISTER	5327	1		u8	0	1	1
@@ -1254,6 +1257,7 @@ Alarm room sens cool oper	MODBUS_HOLDING_REGISTER	3031	1		u8	0	1	0
 Heating, auto	MODBUS_HOLDING_REGISTER	3059	1		u8	0	1	1
 Cooling, auto	MODBUS_HOLDING_REGISTER	3060	1		u8	0	1	1
 Activate SG Ready via API	MODBUS_HOLDING_REGISTER	3032	1		u8	0	1	0
+Requested operating mode (SG Ready)	MODBUS_HOLDING_REGISTER	6008	1		u8	0	3	1
 Factor	MODBUS_HOLDING_REGISTER	3033	1		u8	1	10	5
 Fan speed ERS1 (GQ2)	MODBUS_INPUT_REGISTER	2251	1	%	u8	0	0	0
 Fan speed ERS1 (GQ3)	MODBUS_INPUT_REGISTER	2252	1	%	u8	0	0	0
@@ -1328,7 +1332,7 @@ Active days	MODBUS_HOLDING_REGISTER	3070	1		u8	0	127	0
 Start time	MODBUS_HOLDING_REGISTER	5393	1		-	-	-	-
 Start time	MODBUS_HOLDING_REGISTER	5397	1		-	-	-	-
 Stop time	MODBUS_HOLDING_REGISTER	5401	1		-	-	-	-
-AUX relay (AUX11)	MODBUS_HOLDING_REGISTER	224	1		u8	0	30	5
+AUX relay (AUX11)	MODBUS_HOLDING_REGISTER	224	1		u8	0	32	5
 id:12650	MODBUS_HOLDING_REGISTER	3104	1		-	-	-	-
 id:12651	MODBUS_HOLDING_REGISTER	3144	1		-	-	-	-
 id:12652	MODBUS_HOLDING_REGISTER	3184	1		-	-	-	-
@@ -1489,7 +1493,7 @@ Cooling (Solar PV)	MODBUS_HOLDING_REGISTER	2666	1		u8	0	1	0
 AUX (Solar PV)	MODBUS_HOLDING_REGISTER	2675	1		u8	0	1	0
 id:14052	MODBUS_HOLDING_REGISTER	2670	1	kW	u32	1	999	1
 id:14061	MODBUS_HOLDING_REGISTER	2672	1		u8	0	1	0
-Temperature, Overload, pool	MODBUS_HOLDING_REGISTER	0	1	°C	u8	1	50	1
+Temperature overcharging pool	MODBUS_HOLDING_REGISTER	0	1	°C	u8	1	50	1
 Modbus TCP/IP Ext. (Solar PV)	MODBUS_HOLDING_REGISTER	2107	1		u8	0	1	0
 Modbus TCP/IP Ext.Include own consumption (Solar PV)	MODBUS_HOLDING_REGISTER	2108	1		u8	0	1	0
 Modbus TCP/IP Ext. Available power (Solar PV)	MODBUS_HOLDING_REGISTER	2109	1		u16	0	65535	0
@@ -1564,9 +1568,9 @@ Zone 20 affected by ECS2	MODBUS_HOLDING_REGISTER	2178	1		u8	0	1	0
 Zone 21 affected by ECS2	MODBUS_HOLDING_REGISTER	2179	1		u8	0	1	0
 Zone 22 affected by ECS2	MODBUS_HOLDING_REGISTER	2180	1		u8	0	1	0
 Zone 23 affected by ECS2	MODBUS_HOLDING_REGISTER	2181	1		u8	0	1	0
-Zone 24 affected by ECS2	MODBUS_HOLDING_REGISTER	2182	1		u8	0	1	0
+Op.time electrical heater for heating	MODBUS_INPUT_REGISTER	2182	10	h	s32	0	9999999	0
 Zone 25 affected by ECS2	MODBUS_HOLDING_REGISTER	2183	1		u8	0	1	0
-Zone 26 affected by ECS2	MODBUS_HOLDING_REGISTER	2184	1		u8	0	1	0
+Op.time electrical heater for hot water	MODBUS_INPUT_REGISTER	2184	10	h	s32	0	9999999	0
 Zone 27 affected by ECS2	MODBUS_HOLDING_REGISTER	2185	1		u8	0	1	0
 Zone 28 affected by ECS2	MODBUS_HOLDING_REGISTER	2186	1		u8	0	1	0
 Zone 29 affected by ECS2	MODBUS_HOLDING_REGISTER	2187	1		u8	0	1	0
@@ -1605,8 +1609,6 @@ Time between filter replacement	MODBUS_HOLDING_REGISTER	2676	1		u8	1	24	3
 Time between filter replacement	MODBUS_HOLDING_REGISTER	2677	1		u8	1	24	3
 Time between filter replacement	MODBUS_HOLDING_REGISTER	2678	1		u8	1	24	3
 Time between filter replacement	MODBUS_HOLDING_REGISTER	2679	1		u8	1	24	3
-Total oper. time ext. add. heat, heating	MODBUS_INPUT_REGISTER	2182	10	h	s32	0	9999999	0
-Total HW run time additional heat	MODBUS_INPUT_REGISTER	2184	10	h	s32	0	9999999	0
 id:21077	MODBUS_HOLDING_REGISTER	3020	1		u8	0	0	0
 id:21078	MODBUS_HOLDING_REGISTER	3021	1		u8	0	0	0
 id:21079	MODBUS_HOLDING_REGISTER	3022	1		u8	0	0	0
@@ -1636,27 +1638,27 @@ Time between filter replacement	MODBUS_HOLDING_REGISTER	2728	1		u8	1	24	3
 Time between filter replacement	MODBUS_HOLDING_REGISTER	2729	1		u8	1	24	3
 Time between filter replacement	MODBUS_HOLDING_REGISTER	2730	1		u8	1	24	3
 Time between filter replacement	MODBUS_HOLDING_REGISTER	2731	1		u8	1	24	3
-AUX from Modbus	MODBUS_HOLDING_REGISTER	2740	1		u8	0	68	0
+AUX from Modbus	MODBUS_HOLDING_REGISTER	2740	1		u8	0	69	0
 AUX from Modbus	MODBUS_HOLDING_REGISTER	2741	1		s16	0	0	0
 Heat pump test - Silent mode (EB101/EB102)	MODBUS_HOLDING_REGISTER	5101	1		u8	0	1	0
 Last defrost, heat pump 1	MODBUS_INPUT_REGISTER	2158	1		u8	0	255	255
 Last defrost, heat pump 2	MODBUS_INPUT_REGISTER	2159	1		u8	0	255	255
-ERS 2	MODBUS_HOLDING_REGISTER	2820	1		u8	0	1	0
-ERS 3	MODBUS_HOLDING_REGISTER	2821	1		u8	0	1	0
-ERS 4	MODBUS_HOLDING_REGISTER	2822	1		u8	0	1	0
-ERS 4	MODBUS_HOLDING_REGISTER	2823	1		u8	0	1	0
-ERS 4	MODBUS_HOLDING_REGISTER	2824	1		u8	0	1	1
-ERS 4	MODBUS_HOLDING_REGISTER	2825	1		u8	0	1	1
-ERS 4	MODBUS_HOLDING_REGISTER	2826	1		u8	0	1	1
-ERS 4	MODBUS_HOLDING_REGISTER	2827	1		u8	0	1	1
-Min. vent temp. (ERS 4)	MODBUS_HOLDING_REGISTER	2857	1	°C	u8	0	10	3
-Min. vent temp. (ERS 4)	MODBUS_HOLDING_REGISTER	2858	1	°C	u8	0	10	3
-Min. vent temp. (ERS 4)	MODBUS_HOLDING_REGISTER	2859	1	°C	u8	0	10	3
-Min. vent temp. (ERS 4)	MODBUS_HOLDING_REGISTER	2860	1	°C	u8	0	10	3
-Blocking actions (ERS 4)	MODBUS_HOLDING_REGISTER	2828	1		u8	0	2	2
-Blocking actions (ERS 4)	MODBUS_HOLDING_REGISTER	2829	1		u8	0	2	2
-Blocking actions (ERS 4)	MODBUS_HOLDING_REGISTER	2830	1		u8	0	2	2
-Blocking actions (ERS 4)	MODBUS_HOLDING_REGISTER	2831	1		u8	0	2	2
+ERS 5	MODBUS_HOLDING_REGISTER	2820	1		u8	0	1	0
+ERS 6	MODBUS_HOLDING_REGISTER	2821	1		u8	0	1	0
+ERS 7	MODBUS_HOLDING_REGISTER	2822	1		u8	0	1	0
+ERS 8	MODBUS_HOLDING_REGISTER	2823	1		u8	0	1	0
+ERS 5	MODBUS_HOLDING_REGISTER	2824	1		u8	0	1	1
+ERS 6	MODBUS_HOLDING_REGISTER	2825	1		u8	0	1	1
+ERS 7	MODBUS_HOLDING_REGISTER	2826	1		u8	0	1	1
+ERS 8	MODBUS_HOLDING_REGISTER	2827	1		u8	0	1	1
+Min. vent temp. (ERS 5)	MODBUS_HOLDING_REGISTER	2857	1	°C	u8	0	10	3
+Min. vent temp. (ERS 6)	MODBUS_HOLDING_REGISTER	2858	1	°C	u8	0	10	3
+Min. vent temp. (ERS 7)	MODBUS_HOLDING_REGISTER	2859	1	°C	u8	0	10	3
+Min. vent temp. (ERS 8)	MODBUS_HOLDING_REGISTER	2860	1	°C	u8	0	10	3
+Blocking actions (ERS 5)	MODBUS_HOLDING_REGISTER	2828	1		u8	0	2	2
+Blocking actions (ERS 6)	MODBUS_HOLDING_REGISTER	2829	1		u8	0	2	2
+Blocking actions (ERS 7)	MODBUS_HOLDING_REGISTER	2830	1		u8	0	2	2
+Blocking actions (ERS 8)	MODBUS_HOLDING_REGISTER	2831	1		u8	0	2	2
 id:23145	MODBUS_HOLDING_REGISTER	2921	1		u8	0	1	0
 id:23146	MODBUS_HOLDING_REGISTER	2922	1		u8	0	1	0
 id:23147	MODBUS_HOLDING_REGISTER	2923	1		u8	0	1	0
@@ -1675,7 +1677,7 @@ Fan mode 7	MODBUS_INPUT_REGISTER	2170	1	%	u8	0	0	0
 Fan mode 8	MODBUS_INPUT_REGISTER	2171	1	%	u8	0	0	0
 Disable emergency restart GP1	MODBUS_HOLDING_REGISTER	5392	1		u8	0	1	0
 Disable emergency restart GP1	MODBUS_HOLDING_REGISTER	5025	1		u8	0	1	0
-Modbus external control	MODBUS_HOLDING_REGISTER	5008	1		u8	0	1	0
+Modbus use ext. calc supply	MODBUS_HOLDING_REGISTER	5008	1		u8	0	1	0
 id:24484	MODBUS_HOLDING_REGISTER	5009	10	°C	s16	50	800	450
 id:24485	MODBUS_HOLDING_REGISTER	5010	10	°C	s16	50	800	450
 id:24486	MODBUS_HOLDING_REGISTER	5011	10	°C	s16	50	800	450
@@ -1722,7 +1724,7 @@ Energy log - Used energy by additional heater for hot water over the past hour	M
 Energy log - Energy used by additional heater for pool during current hour	MODBUS_INPUT_REGISTER	2303	100	kWh	u32	0	0	0
 Energy log - Current power consumption	MODBUS_INPUT_REGISTER	2305	100	kW	u32	0	0	0
 Energy log - Current power consumption, components	MODBUS_INPUT_REGISTER	2307	100	kW	u32	0	0	0
-Energy log - Current power consumption, components	MODBUS_INPUT_REGISTER	2408	100	kWh	u32	0	0	0
+Energy log - Current power consumption, components	MODBUS_INPUT_REGISTER	2408	100	kW	u32	0	0	0
 id:25407	MODBUS_HOLDING_REGISTER	0	1		u8	0	0	0
 Compressor, total time energy storage, main unit (EP14)	MODBUS_INPUT_REGISTER	2335	1	h	u32	0	2147483647	0
 Compressor, total time energy storage, main unit (EP15)	MODBUS_INPUT_REGISTER	2337	1	h	u32	0	2147483647	0
@@ -1809,6 +1811,7 @@ id:26840	MODBUS_HOLDING_REGISTER	5206	1		s16	-32768	32767	32767
 id:26865	MODBUS_HOLDING_REGISTER	5181	1		u8	0	1	0
 id:26867	MODBUS_HOLDING_REGISTER	5182	1		u8	0	0	0
 Cooling with solar energy surplus	MODBUS_HOLDING_REGISTER	5458	1		u8	0	1	0
+Power limitation	MODBUS_HOLDING_REGISTER	6007	10	kW	u16	11	1000	42
 Auto mode, start temperature for active cooling	MODBUS_HOLDING_REGISTER	4204	10	°C	s16	0	400	250
 Heating, compressor only	MODBUS_INPUT_REGISTER	1585	10	kWh	u32	0	0	0
 Hot water, compressor only	MODBUS_INPUT_REGISTER	1583	10	kWh	u32	0	0	0
@@ -2113,7 +2116,9 @@ id:28592	MODBUS_HOLDING_REGISTER	5976	1		s32	-10000	10000	100
 id:28593	MODBUS_HOLDING_REGISTER	5978	1		s32	-10000	10000	100
 id:28594	MODBUS_HOLDING_REGISTER	5980	1		s32	-10000	10000	100
 id:28595	MODBUS_HOLDING_REGISTER	5982	1		s32	-10000	10000	100
-id:29258	MODBUS_HOLDING_REGISTER	5984	1	kW	u16	0	65535	0
+Tot. production	MODBUS_INPUT_REGISTER	3821	10	kWh	u32	0	0	0
+Tot. consumption	MODBUS_INPUT_REGISTER	3823	10	kWh	u32	0	0	0
+Production (PV Power)	MODBUS_HOLDING_REGISTER	5984	1	kW	u16	0	65535	0
 Current power	MODBUS_INPUT_REGISTER	2727	100	kW	u32	0	0	0
 Temperature: BT50	MODBUS_INPUT_REGISTER	2800	10	°C	s32	0	0	0
 Humidity: RMU S40 1	MODBUS_INPUT_REGISTER	3130	10	%RH	s32	0	0	0
@@ -2161,12 +2166,6 @@ id:32377	MODBUS_HOLDING_REGISTER	2577	10	°C	s32	50	350	200
 id:32378	MODBUS_HOLDING_REGISTER	2579	10	°C	s32	50	350	200
 id:32379	MODBUS_HOLDING_REGISTER	2581	10	°C	s32	50	350	200
 id:32380	MODBUS_HOLDING_REGISTER	2583	10	°C	s32	50	350	200
-Input AUX7	MODBUS_HOLDING_REGISTER	1555	1		u8	0	68	0
-Input AUX8	MODBUS_HOLDING_REGISTER	1556	1		u8	0	68	0
-Input AUX9	MODBUS_HOLDING_REGISTER	1557	1		u8	0	68	0
-id:55035	MODBUS_HOLDING_REGISTER	1555	1		u8	0	40	0
-id:55036	MODBUS_HOLDING_REGISTER	1556	1		u8	0	40	0
-id:55037	MODBUS_HOLDING_REGISTER	1557	1		u8	0	40	0
 id:55076	MODBUS_HOLDING_REGISTER	2877	1		u8	0	1	0
 id:55077	MODBUS_HOLDING_REGISTER	2878	1		u8	0	1	0
 id:55078	MODBUS_HOLDING_REGISTER	2879	1		u8	0	1	0
@@ -2175,6 +2174,16 @@ id:55080	MODBUS_HOLDING_REGISTER	2881	1		u8	0	1	0
 id:55081	MODBUS_HOLDING_REGISTER	2882	1		u8	0	1	0
 id:55082	MODBUS_HOLDING_REGISTER	2883	1		u8	0	1	0
 id:55083	MODBUS_HOLDING_REGISTER	2884	1		u8	0	1	0
+Speed circulation pump waiting mode heat pump 1	MODBUS_HOLDING_REGISTER	5995	1	%	u8	1	100	30
+Power limitation activation	MODBUS_HOLDING_REGISTER	6012	1		u8	0	1	0
+External reading of BT68 activated	MODBUS_HOLDING_REGISTER	6003	1		u8	0	1	0
+External reading of value BT68	MODBUS_HOLDING_REGISTER	6004	10	°C	s16	0	0	0
+External reading of BT69 activated	MODBUS_HOLDING_REGISTER	6005	1		u8	0	1	0
+External reading of value BT68	MODBUS_HOLDING_REGISTER	6006	10	°C	s16	0	0	0
+Priority	MODBUS_INPUT_REGISTER	3804	1		u8	0	0	0
+Input AUX7	MODBUS_HOLDING_REGISTER	1555	1		u8	0	69	0
+Input AUX8	MODBUS_HOLDING_REGISTER	1556	1		u8	0	69	0
+Input AUX9	MODBUS_HOLDING_REGISTER	1557	1		u8	0	69	0
 Immersion heater power, emergency mode	MODBUS_HOLDING_REGISTER	3028	100	kW	s16	0	4500	940
 Disable emergency restart GP1	MODBUS_HOLDING_REGISTER	3986	1		u8	0	1	0
 Return line (AZ2-BT69)	MODBUS_INPUT_REGISTER	2190	10	°C	s16	0	0	0
@@ -2189,4 +2198,5 @@ id:55102	MODBUS_INPUT_REGISTER	2194	10	°C	s16	0	0	0
 id:55495	MODBUS_HOLDING_REGISTER	5550	1		u8	0	1	0
 id:55749	MODBUS_HOLDING_REGISTER	5551	1		u8	0	1	0
 id:55496	MODBUS_HOLDING_REGISTER	5207	10	°C	s16	0	0	0
-Setpoint power	MODBUS_HOLDING_REGISTER	5997	10	kW	u16	0	60	0
+Set point value power	MODBUS_HOLDING_REGISTER	5997	10	kW	u16	0	600	0
+All sub units operating prio	MODBUS_INPUT_REGISTER	3825	1		u32	0	0	0
\ No newline at end of file
diff --git a/nibe/data/smos40.json b/nibe/data/smos40.json
index 85e5be1..871f7b4 100644
--- a/nibe/data/smos40.json
+++ b/nibe/data/smos40.json
@@ -113,7 +113,7 @@
   "30041": {
     "title": "Flow sensor (BF1)",
     "factor": 10,
-    "unit": "l/m",
+    "unit": "l/min",
     "size": "s16",
     "name": "flow-sensor-bf1-30041"
   },
@@ -932,7 +932,7 @@
     "factor": 1,
     "unit": "h",
     "size": "u32",
-    "min": 0.0,
+    "min": -2147483648.0,
     "max": 2147483647.0,
     "default": 0.0,
     "name": "compressor-total-time-cooling-heat-pump-1-ep14-30268"
@@ -942,7 +942,7 @@
     "factor": 1,
     "unit": "h",
     "size": "u32",
-    "min": 0.0,
+    "min": -2147483648.0,
     "max": 2147483647.0,
     "default": 0.0,
     "name": "compressor-total-time-pool-heat-pump-1-ep14-30270"
@@ -952,20 +952,20 @@
     "factor": 1,
     "unit": "h",
     "size": "u32",
-    "min": 0.0,
+    "min": -2147483648.0,
     "max": 2147483647.0,
     "default": 0.0,
     "name": "compressor-total-time-pool-2-heat-pump-1-ep14-30272"
   },
   "30280": {
-    "title": "Compressor, total time cooling, main unit (EP14)",
+    "title": "Total run time compressor cooling",
     "factor": 1,
     "unit": "h",
     "size": "u32",
     "min": 0.0,
     "max": 2147483647.0,
     "default": 0.0,
-    "name": "compressor-total-time-cooling-main-unit-ep14-30280"
+    "name": "total-run-time-compressor-cooling-30280"
   },
   "30282": {
     "title": "Compressor, total time pool, main unit (EP14)",
@@ -3417,10 +3417,10 @@
     "name": "fan-mode-1-31038"
   },
   "31039": {
-    "title": "Current hot water mode",
+    "title": "Current hot water mode without SPA/SC",
     "factor": 1,
     "size": "s8",
-    "name": "current-hot-water-mode-31039"
+    "name": "current-hot-water-mode-without-spa-sc-31039"
   },
   "31054": {
     "title": "Blocking cooling",
@@ -3545,18 +3545,18 @@
     "size": "u8",
     "name": "docked-compressors-pool-1-31111"
   },
-  "32197": {
-    "title": "Reversing valve hot water (QN10)",
-    "factor": 1,
-    "size": "u8",
-    "name": "reversing-valve-hot-water-qn10-32197"
-  },
   "31118": {
     "title": "Relay status, base board (EB100-EP14)",
     "factor": 1,
     "size": "u8",
     "name": "relay-status-base-board-eb100-ep14-31118"
   },
+  "32197": {
+    "title": "Diverter valve hot water (QN10)",
+    "factor": 1,
+    "size": "u8",
+    "name": "diverter-valve-hot-water-qn10-32197"
+  },
   "31120": {
     "title": "Relay status, imm. heat. board (EB100-EP14)",
     "factor": 1,
@@ -3762,7 +3762,7 @@
     "name": "return-line-eb101-bt3-31476"
   },
   "31479": {
-    "title": "Condenser sensor, supply line (EB101-BT12)",
+    "title": "Condenser sensor supply line (EB101-BT12)",
     "factor": 10,
     "unit": "\u00b0C",
     "size": "s16",
@@ -3829,7 +3829,7 @@
     "factor": 1,
     "unit": "h",
     "size": "u32",
-    "min": 0.0,
+    "min": -2147483648.0,
     "max": 2147483647.0,
     "default": 0.0,
     "name": "compressor-oper-time-total-eb101-ep14-31492"
@@ -3839,7 +3839,7 @@
     "factor": 1,
     "unit": "h",
     "size": "u32",
-    "min": 0.0,
+    "min": -2147483648.0,
     "max": 2147483647.0,
     "default": 0.0,
     "name": "compressor-oper-time-hot-water-eb101-ep14-31494"
@@ -4964,11 +4964,11 @@
     "name": "low-press-sensor-unprocessed-eb101-ep14-31903"
   },
   "31904": {
-    "title": "Current sensor (EB101-EP14)",
+    "title": "Current (EB101-EP14)",
     "factor": 10,
     "unit": "A",
     "size": "s16",
-    "name": "current-sensor-eb101-ep14-31904"
+    "name": "current-eb101-ep14-31904"
   },
   "31906": {
     "title": "Low press. sensor, unprocessed (EB100-EP15)",
@@ -4977,11 +4977,11 @@
     "name": "low-press-sensor-unprocessed-eb100-ep15-31906"
   },
   "31907": {
-    "title": "Current sensor (EB100-EP15)",
+    "title": "Current (EB100-EP15)",
     "factor": 10,
     "unit": "A",
     "size": "s16",
-    "name": "current-sensor-eb100-ep15-31907"
+    "name": "current-eb100-ep15-31907"
   },
   "31909": {
     "title": "Low press. sensor, unprocessed (EB100-EP14)",
@@ -4990,11 +4990,11 @@
     "name": "low-press-sensor-unprocessed-eb100-ep14-31909"
   },
   "31910": {
-    "title": "Current sensor (EB100-EP14)",
+    "title": "Current (EB100-EP14)",
     "factor": 10,
     "unit": "A",
     "size": "s16",
-    "name": "current-sensor-eb100-ep14-31910"
+    "name": "current-eb100-ep14-31910"
   },
   "31912": {
     "title": "Operating mode (SG Ready)",
@@ -5015,10 +5015,10 @@
     "name": "sg-ready-input-b-31914"
   },
   "31916": {
-    "title": "Hot water comfort mode (SPA)",
+    "title": "Hot water mode (SPA)",
     "factor": 1,
     "size": "s8",
-    "name": "hot-water-comfort-mode-spa-31916"
+    "name": "hot-water-mode-spa-31916"
   },
   "31917": {
     "title": "Pool offset (SPA)",
@@ -5363,13 +5363,13 @@
     "write": true
   },
   "40057": {
-    "title": "Hot water demand mode",
+    "title": "Hot water mode",
     "factor": 1,
     "size": "s8",
     "min": 0.0,
     "max": 4.0,
     "default": 1.0,
-    "name": "hot-water-demand-mode-40057",
+    "name": "hot-water-mode-40057",
     "write": true,
     "mappings": {
       "0": "Small",
@@ -6335,7 +6335,7 @@
     "factor": 1,
     "size": "u8",
     "min": 0.0,
-    "max": 68.0,
+    "max": 69.0,
     "default": 0.0,
     "name": "input-aux5-40212",
     "write": true
@@ -6345,7 +6345,7 @@
     "factor": 1,
     "size": "u8",
     "min": 0.0,
-    "max": 68.0,
+    "max": 69.0,
     "default": 0.0,
     "name": "input-aux4-40213",
     "write": true
@@ -6355,7 +6355,7 @@
     "factor": 1,
     "size": "u8",
     "min": 0.0,
-    "max": 68.0,
+    "max": 69.0,
     "default": 0.0,
     "name": "input-aux3-40214",
     "write": true
@@ -6365,7 +6365,7 @@
     "factor": 1,
     "size": "u8",
     "min": 0.0,
-    "max": 68.0,
+    "max": 69.0,
     "default": 0.0,
     "name": "input-aux2-40215",
     "write": true
@@ -6375,7 +6375,7 @@
     "factor": 1,
     "size": "u8",
     "min": 0.0,
-    "max": 68.0,
+    "max": 69.0,
     "default": 0.0,
     "name": "input-aux1-40216",
     "write": true
@@ -6385,7 +6385,7 @@
     "factor": 1,
     "size": "u8",
     "min": 0.0,
-    "max": 30.0,
+    "max": 32.0,
     "default": 0.0,
     "name": "output-aux1-40217",
     "write": true
@@ -6719,13 +6719,13 @@
     "write": true
   },
   "40759": {
-    "title": "Additional heat after reversing valve",
+    "title": "Additional heat after diverter valve",
     "factor": 1,
     "size": "u8",
     "min": 0.0,
     "max": 1.0,
     "default": 1.0,
-    "name": "additional-heat-after-reversing-valve-40759",
+    "name": "additional-heat-after-diverter-valve-40759",
     "write": true
   },
   "40760": {
@@ -6773,7 +6773,7 @@
     "factor": 1,
     "size": "u8",
     "min": 0.0,
-    "max": 68.0,
+    "max": 69.0,
     "default": 0.0,
     "name": "input-aux6-40768",
     "write": true
@@ -8048,7 +8048,7 @@
     "factor": 1,
     "size": "u16",
     "min": 0.0,
-    "max": 10000.0,
+    "max": 60000.0,
     "default": 100.0,
     "name": "el-price-fixed-smart-energy-source-41109",
     "write": true
@@ -8068,7 +8068,7 @@
     "factor": 1,
     "size": "u16",
     "min": 0.0,
-    "max": 10000.0,
+    "max": 60000.0,
     "default": 100.0,
     "name": "el-price-fixed-smart-energy-source-41111",
     "write": true
@@ -8088,7 +8088,7 @@
     "factor": 1,
     "size": "u16",
     "min": 0.0,
-    "max": 10000.0,
+    "max": 60000.0,
     "default": 100.0,
     "name": "el-price-fixed-smart-energy-source-41113",
     "write": true
@@ -8108,7 +8108,7 @@
     "factor": 1,
     "size": "u16",
     "min": 0.0,
-    "max": 10000.0,
+    "max": 60000.0,
     "default": 100.0,
     "name": "el-price-fixed-smart-energy-source-41115",
     "write": true
@@ -8198,7 +8198,7 @@
     "factor": 1,
     "size": "u16",
     "min": 1.0,
-    "max": 10000.0,
+    "max": 60000.0,
     "default": 100.0,
     "name": "ext-step-add-heat-high-tariff-price-smart-energy-source-41124",
     "write": true
@@ -8208,7 +8208,7 @@
     "factor": 1,
     "size": "u16",
     "min": 1.0,
-    "max": 10000.0,
+    "max": 60000.0,
     "default": 100.0,
     "name": "ext-step-add-heat-low-tariff-price-smart-energy-source-41125",
     "write": true
@@ -8218,7 +8218,7 @@
     "factor": 1,
     "size": "u16",
     "min": 1.0,
-    "max": 10000.0,
+    "max": 60000.0,
     "default": 100.0,
     "name": "shunt-add-heat-high-tariff-price-smart-energy-source-41126",
     "write": true
@@ -8228,7 +8228,7 @@
     "factor": 1,
     "size": "u16",
     "min": 1.0,
-    "max": 10000.0,
+    "max": 60000.0,
     "default": 100.0,
     "name": "shunt-add-heat-low-tariff-price-smart-energy-source-41127",
     "write": true
@@ -8238,7 +8238,7 @@
     "factor": 1,
     "size": "u16",
     "min": 1.0,
-    "max": 10000.0,
+    "max": 60000.0,
     "default": 100.0,
     "name": "el-price-fixed-high-tariff-smart-energy-source-41128",
     "write": true
@@ -8248,7 +8248,7 @@
     "factor": 1,
     "size": "u16",
     "min": 1.0,
-    "max": 10000.0,
+    "max": 60000.0,
     "default": 100.0,
     "name": "el-price-fixed-low-tariff-smart-energy-source-41129",
     "write": true
@@ -8258,7 +8258,7 @@
     "factor": 1,
     "size": "u16",
     "min": 1.0,
-    "max": 10000.0,
+    "max": 60000.0,
     "default": 100.0,
     "name": "el-price-variable-high-tariff-smart-energy-source-41130",
     "write": true
@@ -8268,7 +8268,7 @@
     "factor": 1,
     "size": "u16",
     "min": 1.0,
-    "max": 10000.0,
+    "max": 60000.0,
     "default": 100.0,
     "name": "el-price-variable-low-tariff-smart-energy-source-41131",
     "write": true
@@ -8656,6 +8656,16 @@
     "name": "mode-energy-meter-be6-44016",
     "write": true
   },
+  "44017": {
+    "title": "Mode, energy meter (BE7)",
+    "factor": 1,
+    "size": "u8",
+    "min": 0.0,
+    "max": 255.0,
+    "default": 255.0,
+    "name": "mode-energy-meter-be7-44017",
+    "write": true
+  },
   "44077": {
     "title": "ERS 2",
     "factor": 1,
@@ -8717,6 +8727,22 @@
     "name": "hot-water-additional-heat-used-in-heating-mode-44204",
     "write": true
   },
+  "44128": {
+    "title": "Mode, energy meter (BE11)",
+    "factor": 1,
+    "size": "u8",
+    "min": 0.0,
+    "max": 255.0,
+    "default": 255.0,
+    "name": "mode-energy-meter-be11-44128",
+    "write": true
+  },
+  "32455": {
+    "title": "External addition steps active",
+    "factor": 1,
+    "size": "u8",
+    "name": "external-addition-steps-active-32455"
+  },
   "41982": {
     "title": "HTS 2",
     "factor": 1,
@@ -9115,7 +9141,7 @@
     "size": "u8",
     "min": 1.0,
     "max": 50.0,
-    "default": 1.0,
+    "default": 0.0,
     "name": "minimum-permitted-speed-eb101-gp12-45353",
     "write": true
   },
@@ -9218,43 +9244,50 @@
     "write": true
   },
   "41999": {
-    "title": "System 4 (RMU)",
+    "title": "System 5 (RMU)",
     "factor": 1,
     "size": "u8",
     "min": 0.0,
     "max": 1.0,
     "default": 0.0,
-    "name": "system-4-rmu-41999",
+    "name": "system-5-rmu-41999",
     "write": true
   },
   "42000": {
-    "title": "System 4 (RMU)",
+    "title": "System 6 (RMU)",
     "factor": 1,
     "size": "u8",
     "min": 0.0,
     "max": 1.0,
     "default": 0.0,
-    "name": "system-4-rmu-42000",
+    "name": "system-6-rmu-42000",
     "write": true
   },
   "42001": {
-    "title": "System 4 (RMU)",
+    "title": "System 7 (RMU)",
     "factor": 1,
     "size": "u8",
     "min": 0.0,
     "max": 1.0,
     "default": 0.0,
-    "name": "system-4-rmu-42001",
+    "name": "system-7-rmu-42001",
     "write": true
   },
   "42002": {
-    "title": "System 4 (RMU)",
+    "title": "System 8 (RMU)",
     "factor": 1,
     "size": "u8",
     "min": 0.0,
     "max": 1.0,
     "default": 0.0,
-    "name": "system-4-rmu-42002",
+    "name": "system-8-rmu-42002",
+    "write": true
+  },
+  "45391": {
+    "title": "Away mode status",
+    "factor": 1,
+    "size": "u8",
+    "name": "away-mode-status-45391",
     "write": true
   },
   "42743": {
@@ -9359,6 +9392,16 @@
     "name": "activate-sg-ready-via-api-43033",
     "write": true
   },
+  "46009": {
+    "title": "Requested operating mode (SG Ready)",
+    "factor": 1,
+    "size": "u8",
+    "min": 0.0,
+    "max": 3.0,
+    "default": 1.0,
+    "name": "requested-operating-mode-sg-ready-46009",
+    "write": true
+  },
   "43034": {
     "title": "Factor",
     "factor": 1,
@@ -9523,7 +9566,7 @@
     "factor": 1,
     "size": "u8",
     "min": 0.0,
-    "max": 30.0,
+    "max": 32.0,
     "default": 5.0,
     "name": "aux-relay-aux11-40225",
     "write": true
@@ -9580,14 +9623,14 @@
     "write": true
   },
   "40001": {
-    "title": "Temperature, Overload, pool",
+    "title": "Temperature overcharging pool",
     "factor": 1,
     "unit": "\u00b0C",
     "size": "u8",
     "min": 1.0,
     "max": 50.0,
     "default": 1.0,
-    "name": "temperature-overload-pool-40001",
+    "name": "temperature-overcharging-pool-40001",
     "write": true
   },
   "42108": {
@@ -10330,15 +10373,15 @@
     "name": "zone-23-affected-by-ecs2-42182",
     "write": true
   },
-  "42183": {
-    "title": "Zone 24 affected by ECS2",
-    "factor": 1,
-    "size": "u8",
+  "32183": {
+    "title": "Op.time electrical heater for heating",
+    "factor": 10,
+    "unit": "h",
+    "size": "s32",
     "min": 0.0,
-    "max": 1.0,
+    "max": 9999999.0,
     "default": 0.0,
-    "name": "zone-24-affected-by-ecs2-42183",
-    "write": true
+    "name": "op-time-electrical-heater-for-heating-32183"
   },
   "42184": {
     "title": "Zone 25 affected by ECS2",
@@ -10350,15 +10393,15 @@
     "name": "zone-25-affected-by-ecs2-42184",
     "write": true
   },
-  "42185": {
-    "title": "Zone 26 affected by ECS2",
-    "factor": 1,
-    "size": "u8",
+  "32185": {
+    "title": "Op.time electrical heater for hot water",
+    "factor": 10,
+    "unit": "h",
+    "size": "s32",
     "min": 0.0,
-    "max": 1.0,
+    "max": 9999999.0,
     "default": 0.0,
-    "name": "zone-26-affected-by-ecs2-42185",
-    "write": true
+    "name": "op-time-electrical-heater-for-hot-water-32185"
   },
   "42186": {
     "title": "Zone 27 affected by ECS2",
@@ -10732,26 +10775,6 @@
     "name": "time-between-filter-replacement-42680",
     "write": true
   },
-  "32183": {
-    "title": "Total oper. time ext. add. heat, heating",
-    "factor": 10,
-    "unit": "h",
-    "size": "s32",
-    "min": 0.0,
-    "max": 9999999.0,
-    "default": 0.0,
-    "name": "total-oper-time-ext-add-heat-heating-32183"
-  },
-  "32185": {
-    "title": "Total HW run time additional heat",
-    "factor": 10,
-    "unit": "h",
-    "size": "s32",
-    "min": 0.0,
-    "max": 9999999.0,
-    "default": 0.0,
-    "name": "total-hw-run-time-additional-heat-32185"
-  },
   "42701": {
     "title": "Return time fan 4",
     "factor": 1,
@@ -10973,7 +10996,7 @@
     "factor": 1,
     "size": "u8",
     "min": 0.0,
-    "max": 68.0,
+    "max": 69.0,
     "default": 0.0,
     "name": "aux-from-modbus-42741",
     "write": true
@@ -11014,167 +11037,167 @@
     "name": "last-defrost-heat-pump-2-32160"
   },
   "42821": {
-    "title": "ERS 2",
+    "title": "ERS 5",
     "factor": 1,
     "size": "u8",
     "min": 0.0,
     "max": 1.0,
     "default": 0.0,
-    "name": "ers-2-42821",
+    "name": "ers-5-42821",
     "write": true
   },
   "42822": {
-    "title": "ERS 3",
+    "title": "ERS 6",
     "factor": 1,
     "size": "u8",
     "min": 0.0,
     "max": 1.0,
     "default": 0.0,
-    "name": "ers-3-42822",
+    "name": "ers-6-42822",
     "write": true
   },
   "42823": {
-    "title": "ERS 4",
+    "title": "ERS 7",
     "factor": 1,
     "size": "u8",
     "min": 0.0,
     "max": 1.0,
     "default": 0.0,
-    "name": "ers-4-42823",
+    "name": "ers-7-42823",
     "write": true
   },
   "42824": {
-    "title": "ERS 4",
+    "title": "ERS 8",
     "factor": 1,
     "size": "u8",
     "min": 0.0,
     "max": 1.0,
     "default": 0.0,
-    "name": "ers-4-42824",
+    "name": "ers-8-42824",
     "write": true
   },
   "42825": {
-    "title": "ERS 4",
+    "title": "ERS 5",
     "factor": 1,
     "size": "u8",
     "min": 0.0,
     "max": 1.0,
     "default": 1.0,
-    "name": "ers-4-42825",
+    "name": "ers-5-42825",
     "write": true
   },
   "42826": {
-    "title": "ERS 4",
+    "title": "ERS 6",
     "factor": 1,
     "size": "u8",
     "min": 0.0,
     "max": 1.0,
     "default": 1.0,
-    "name": "ers-4-42826",
+    "name": "ers-6-42826",
     "write": true
   },
   "42827": {
-    "title": "ERS 4",
+    "title": "ERS 7",
     "factor": 1,
     "size": "u8",
     "min": 0.0,
     "max": 1.0,
     "default": 1.0,
-    "name": "ers-4-42827",
+    "name": "ers-7-42827",
     "write": true
   },
   "42828": {
-    "title": "ERS 4",
+    "title": "ERS 8",
     "factor": 1,
     "size": "u8",
     "min": 0.0,
     "max": 1.0,
     "default": 1.0,
-    "name": "ers-4-42828",
+    "name": "ers-8-42828",
     "write": true
   },
   "42858": {
-    "title": "Min. vent temp. (ERS 4)",
+    "title": "Min. vent temp. (ERS 5)",
     "factor": 1,
     "unit": "\u00b0C",
     "size": "u8",
     "min": 0.0,
     "max": 10.0,
     "default": 3.0,
-    "name": "min-vent-temp-ers-4-42858",
+    "name": "min-vent-temp-ers-5-42858",
     "write": true
   },
   "42859": {
-    "title": "Min. vent temp. (ERS 4)",
+    "title": "Min. vent temp. (ERS 6)",
     "factor": 1,
     "unit": "\u00b0C",
     "size": "u8",
     "min": 0.0,
     "max": 10.0,
     "default": 3.0,
-    "name": "min-vent-temp-ers-4-42859",
+    "name": "min-vent-temp-ers-6-42859",
     "write": true
   },
   "42860": {
-    "title": "Min. vent temp. (ERS 4)",
+    "title": "Min. vent temp. (ERS 7)",
     "factor": 1,
     "unit": "\u00b0C",
     "size": "u8",
     "min": 0.0,
     "max": 10.0,
     "default": 3.0,
-    "name": "min-vent-temp-ers-4-42860",
+    "name": "min-vent-temp-ers-7-42860",
     "write": true
   },
   "42861": {
-    "title": "Min. vent temp. (ERS 4)",
+    "title": "Min. vent temp. (ERS 8)",
     "factor": 1,
     "unit": "\u00b0C",
     "size": "u8",
     "min": 0.0,
     "max": 10.0,
     "default": 3.0,
-    "name": "min-vent-temp-ers-4-42861",
+    "name": "min-vent-temp-ers-8-42861",
     "write": true
   },
   "42829": {
-    "title": "Blocking actions (ERS 4)",
+    "title": "Blocking actions (ERS 5)",
     "factor": 1,
     "size": "u8",
     "min": 0.0,
     "max": 2.0,
     "default": 2.0,
-    "name": "blocking-actions-ers-4-42829",
+    "name": "blocking-actions-ers-5-42829",
     "write": true
   },
   "42830": {
-    "title": "Blocking actions (ERS 4)",
+    "title": "Blocking actions (ERS 6)",
     "factor": 1,
     "size": "u8",
     "min": 0.0,
     "max": 2.0,
     "default": 2.0,
-    "name": "blocking-actions-ers-4-42830",
+    "name": "blocking-actions-ers-6-42830",
     "write": true
   },
   "42831": {
-    "title": "Blocking actions (ERS 4)",
+    "title": "Blocking actions (ERS 7)",
     "factor": 1,
     "size": "u8",
     "min": 0.0,
     "max": 2.0,
     "default": 2.0,
-    "name": "blocking-actions-ers-4-42831",
+    "name": "blocking-actions-ers-7-42831",
     "write": true
   },
   "42832": {
-    "title": "Blocking actions (ERS 4)",
+    "title": "Blocking actions (ERS 8)",
     "factor": 1,
     "size": "u8",
     "min": 0.0,
     "max": 2.0,
     "default": 2.0,
-    "name": "blocking-actions-ers-4-42832",
+    "name": "blocking-actions-ers-8-42832",
     "write": true
   },
   "32169": {
@@ -11226,13 +11249,13 @@
     "write": true
   },
   "45009": {
-    "title": "Modbus external control",
+    "title": "Modbus use ext. calc supply",
     "factor": 1,
     "size": "u8",
     "min": 0.0,
     "max": 1.0,
     "default": 0.0,
-    "name": "modbus-external-control-45009",
+    "name": "modbus-use-ext-calc-supply-45009",
     "write": true
   },
   "30001": {
@@ -11335,7 +11358,7 @@
   "32409": {
     "title": "Energy log - Current power consumption, components",
     "factor": 100,
-    "unit": "kWh",
+    "unit": "kW",
     "size": "u32",
     "name": "energy-log-current-power-consumption-components-32409"
   },
@@ -11675,6 +11698,17 @@
     "name": "cooling-with-solar-energy-surplus-45459",
     "write": true
   },
+  "46008": {
+    "title": "Power limitation",
+    "factor": 10,
+    "unit": "kW",
+    "size": "u16",
+    "min": 11.0,
+    "max": 1000.0,
+    "default": 42.0,
+    "name": "power-limitation-46008",
+    "write": true
+  },
   "44205": {
     "title": "Auto mode, start temperature for active cooling",
     "factor": 10,
@@ -11721,6 +11755,31 @@
     "size": "s16",
     "name": "boiler-temperature-bt52-33801"
   },
+  "33822": {
+    "title": "Tot. production",
+    "factor": 10,
+    "unit": "kWh",
+    "size": "u32",
+    "name": "tot-production-33822"
+  },
+  "33824": {
+    "title": "Tot. consumption",
+    "factor": 10,
+    "unit": "kWh",
+    "size": "u32",
+    "name": "tot-consumption-33824"
+  },
+  "45985": {
+    "title": "Production (PV Power)",
+    "factor": 1,
+    "unit": "kW",
+    "size": "u16",
+    "min": 0.0,
+    "max": 65535.0,
+    "default": 0.0,
+    "name": "production-pv-power-45985",
+    "write": true
+  },
   "32728": {
     "title": "Current power",
     "factor": 100,
@@ -11771,12 +11830,75 @@
     "name": "speed-circulation-pump-standby-mode-eb100-45997",
     "write": true
   },
+  "45996": {
+    "title": "Speed circulation pump waiting mode heat pump 1",
+    "factor": 1,
+    "unit": "%",
+    "size": "u8",
+    "min": 1.0,
+    "max": 100.0,
+    "default": 30.0,
+    "name": "speed-circulation-pump-waiting-mode-heat-pump-1-45996",
+    "write": true
+  },
+  "46013": {
+    "title": "Power limitation activation",
+    "factor": 1,
+    "size": "u8",
+    "min": 0.0,
+    "max": 1.0,
+    "default": 0.0,
+    "name": "power-limitation-activation-46013",
+    "write": true
+  },
+  "46004": {
+    "title": "External reading of BT68 activated",
+    "factor": 1,
+    "size": "u8",
+    "min": 0.0,
+    "max": 1.0,
+    "default": 0.0,
+    "name": "external-reading-of-bt68-activated-46004",
+    "write": true
+  },
+  "46005": {
+    "title": "External reading of value BT68",
+    "factor": 10,
+    "unit": "\u00b0C",
+    "size": "s16",
+    "name": "external-reading-of-value-bt68-46005",
+    "write": true
+  },
+  "46006": {
+    "title": "External reading of BT69 activated",
+    "factor": 1,
+    "size": "u8",
+    "min": 0.0,
+    "max": 1.0,
+    "default": 0.0,
+    "name": "external-reading-of-bt69-activated-46006",
+    "write": true
+  },
+  "46007": {
+    "title": "External reading of value BT68",
+    "factor": 10,
+    "unit": "\u00b0C",
+    "size": "s16",
+    "name": "external-reading-of-value-bt68-46007",
+    "write": true
+  },
+  "33805": {
+    "title": "Priority",
+    "factor": 1,
+    "size": "u8",
+    "name": "priority-33805"
+  },
   "41556": {
     "title": "Input AUX7",
     "factor": 1,
     "size": "u8",
     "min": 0.0,
-    "max": 68.0,
+    "max": 69.0,
     "default": 0.0,
     "name": "input-aux7-41556",
     "write": true
@@ -11786,7 +11908,7 @@
     "factor": 1,
     "size": "u8",
     "min": 0.0,
-    "max": 68.0,
+    "max": 69.0,
     "default": 0.0,
     "name": "input-aux8-41557",
     "write": true
@@ -11796,7 +11918,7 @@
     "factor": 1,
     "size": "u8",
     "min": 0.0,
-    "max": 68.0,
+    "max": 69.0,
     "default": 0.0,
     "name": "input-aux9-41558",
     "write": true
@@ -11861,14 +11983,20 @@
     "name": "eev-state-eb102-32423"
   },
   "45998": {
-    "title": "Setpoint power",
+    "title": "Set point value power",
     "factor": 10,
     "unit": "kW",
     "size": "u16",
     "min": 0.0,
-    "max": 60.0,
+    "max": 600.0,
     "default": 0.0,
-    "name": "setpoint-power-45998",
+    "name": "set-point-value-power-45998",
     "write": true
+  },
+  "33826": {
+    "title": "All sub units operating prio",
+    "factor": 1,
+    "size": "u32",
+    "name": "all-sub-units-operating-prio-33826"
   }
 }