diff --git a/components/panasonic_heatpump/sensor.py b/components/panasonic_heatpump/sensor.py
index d9c0696..d751626 100755
--- a/components/panasonic_heatpump/sensor.py
+++ b/components/panasonic_heatpump/sensor.py
@@ -215,101 +215,275 @@ CONFIG_SCHEMA = cv.All(
       cv.GenerateID(CONF_PANASONIC_HEATPUMP_ID): cv.use_id(PanasonicHeatpumpComponent),
 
       cv.Optional(CONF_SENS_TOP1): sensor.sensor_schema(
-        accuracy_decimals = 1,
-        unit_of_measurement = UNIT_LITRE_PER_MINUTE),
+        unit_of_measurement = UNIT_LITRE_PER_MINUTE
+      ),
       cv.Optional(CONF_SENS_TOP5): sensor.sensor_schema(
-        accuracy_decimals = 1,
-        unit_of_measurement = UNIT_CELSIUS),
-      cv.Optional(CONF_SENS_TOP6): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP7): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP8): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP9): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP10): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP11): sensor.sensor_schema(),
+        unit_of_measurement = UNIT_CELSIUS
+      ),
+      cv.Optional(CONF_SENS_TOP6): sensor.sensor_schema(
+        unit_of_measurement = UNIT_CELSIUS
+      ),
+      cv.Optional(CONF_SENS_TOP7): sensor.sensor_schema(
+        unit_of_measurement = UNIT_CELSIUS
+      ),
+      cv.Optional(CONF_SENS_TOP8): sensor.sensor_schema(
+        unit_of_measurement = UNIT_HERTZ
+      ),
+      cv.Optional(CONF_SENS_TOP9): sensor.sensor_schema(
+        unit_of_measurement = UNIT_CELSIUS
+      ),
+      cv.Optional(CONF_SENS_TOP10): sensor.sensor_schema(
+        unit_of_measurement = UNIT_CELSIUS
+      ),
+      cv.Optional(CONF_SENS_TOP11): sensor.sensor_schema(
+        unit_of_measurement = UNIT_HOUR
+      ),
       cv.Optional(CONF_SENS_TOP12): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP14): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP15): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP16): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP21): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP22): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP23): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP24): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP25): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP27): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP28): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP29): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP30): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP31): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP32): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP33): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP34): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP35): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP36): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP37): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP38): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP39): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP40): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP41): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP42): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP43): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP45): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP46): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP47): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP48): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP49): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP50): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP51): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP52): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP53): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP54): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP55): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP56): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP57): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP62): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP63): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP64): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP65): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP66): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP67): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP70): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP71): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP72): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP73): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP74): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP75): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP77): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP78): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP79): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP80): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP82): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP83): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP84): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP85): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP86): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP87): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP88): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP89): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP90): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP91): sensor.sensor_schema(),
+      cv.Optional(CONF_SENS_TOP14): sensor.sensor_schema(
+        unit_of_measurement = UNIT_CELSIUS
+      ),
+      cv.Optional(CONF_SENS_TOP15): sensor.sensor_schema(
+        unit_of_measurement = UNIT_WATT
+      ),
+      cv.Optional(CONF_SENS_TOP16): sensor.sensor_schema(
+        unit_of_measurement = UNIT_WATT
+      ),
+      cv.Optional(CONF_SENS_TOP21): sensor.sensor_schema(
+        unit_of_measurement = UNIT_CELSIUS
+      ),
+      cv.Optional(CONF_SENS_TOP22): sensor.sensor_schema(
+        unit_of_measurement = UNIT_KELVIN
+      ),
+      cv.Optional(CONF_SENS_TOP23): sensor.sensor_schema(
+        unit_of_measurement = UNIT_KELVIN
+      ),
+      cv.Optional(CONF_SENS_TOP24): sensor.sensor_schema(
+        unit_of_measurement = UNIT_KELVIN
+      ),
+      cv.Optional(CONF_SENS_TOP25): sensor.sensor_schema(
+        unit_of_measurement = UNIT_KELVIN
+      ),
+      cv.Optional(CONF_SENS_TOP27): sensor.sensor_schema(
+        unit_of_measurement = UNIT_CELSIUS
+      ),
+      cv.Optional(CONF_SENS_TOP28): sensor.sensor_schema(
+        unit_of_measurement = UNIT_CELSIUS
+      ),
+      cv.Optional(CONF_SENS_TOP29): sensor.sensor_schema(
+        unit_of_measurement = UNIT_CELSIUS
+      ),
+      cv.Optional(CONF_SENS_TOP30): sensor.sensor_schema(
+        unit_of_measurement = UNIT_CELSIUS
+      ),
+      cv.Optional(CONF_SENS_TOP31): sensor.sensor_schema(
+        unit_of_measurement = UNIT_CELSIUS
+      ),
+      cv.Optional(CONF_SENS_TOP32): sensor.sensor_schema(
+        unit_of_measurement = UNIT_CELSIUS
+      ),
+      cv.Optional(CONF_SENS_TOP33): sensor.sensor_schema(
+        unit_of_measurement = UNIT_CELSIUS
+      ),
+      cv.Optional(CONF_SENS_TOP34): sensor.sensor_schema(
+        unit_of_measurement = UNIT_CELSIUS
+      ),
+      cv.Optional(CONF_SENS_TOP35): sensor.sensor_schema(
+        unit_of_measurement = UNIT_CELSIUS
+      ),
+      cv.Optional(CONF_SENS_TOP36): sensor.sensor_schema(
+        unit_of_measurement = UNIT_CELSIUS
+      ),
+      cv.Optional(CONF_SENS_TOP37): sensor.sensor_schema(
+        unit_of_measurement = UNIT_CELSIUS
+      ),
+      cv.Optional(CONF_SENS_TOP38): sensor.sensor_schema(
+        unit_of_measurement = UNIT_WATT
+      ),
+      cv.Optional(CONF_SENS_TOP39): sensor.sensor_schema(
+        unit_of_measurement = UNIT_WATT
+      ),
+      cv.Optional(CONF_SENS_TOP40): sensor.sensor_schema(
+        unit_of_measurement = UNIT_WATT
+      ),
+      cv.Optional(CONF_SENS_TOP41): sensor.sensor_schema(
+        unit_of_measurement = UNIT_WATT
+      ),
+      cv.Optional(CONF_SENS_TOP42): sensor.sensor_schema(
+        unit_of_measurement = UNIT_CELSIUS
+      ),
+      cv.Optional(CONF_SENS_TOP43): sensor.sensor_schema(
+        unit_of_measurement = UNIT_CELSIUS
+      ),
+      cv.Optional(CONF_SENS_TOP45): sensor.sensor_schema(
+        unit_of_measurement = UNIT_KELVIN
+      ),
+      cv.Optional(CONF_SENS_TOP46): sensor.sensor_schema(
+        unit_of_measurement = UNIT_CELSIUS
+      ),
+      cv.Optional(CONF_SENS_TOP47): sensor.sensor_schema(
+        unit_of_measurement = UNIT_CELSIUS
+      ),
+      cv.Optional(CONF_SENS_TOP48): sensor.sensor_schema(
+        unit_of_measurement = UNIT_CELSIUS
+      ),
+      cv.Optional(CONF_SENS_TOP49): sensor.sensor_schema(
+        unit_of_measurement = UNIT_CELSIUS
+      ),
+      cv.Optional(CONF_SENS_TOP50): sensor.sensor_schema(
+        unit_of_measurement = UNIT_CELSIUS
+      ),
+      cv.Optional(CONF_SENS_TOP51): sensor.sensor_schema(
+        unit_of_measurement = UNIT_CELSIUS
+      ),
+      cv.Optional(CONF_SENS_TOP52): sensor.sensor_schema(
+        unit_of_measurement = UNIT_CELSIUS
+      ),
+      cv.Optional(CONF_SENS_TOP53): sensor.sensor_schema(
+        unit_of_measurement = UNIT_CELSIUS
+      ),
+      cv.Optional(CONF_SENS_TOP54): sensor.sensor_schema(
+        unit_of_measurement = UNIT_CELSIUS
+      ),
+      cv.Optional(CONF_SENS_TOP55): sensor.sensor_schema(
+        unit_of_measurement = UNIT_CELSIUS
+      ),
+      cv.Optional(CONF_SENS_TOP56): sensor.sensor_schema(
+        unit_of_measurement = UNIT_CELSIUS
+      ),
+      cv.Optional(CONF_SENS_TOP57): sensor.sensor_schema(
+        unit_of_measurement = UNIT_CELSIUS
+      ),
+      cv.Optional(CONF_SENS_TOP62): sensor.sensor_schema(
+        unit_of_measurement = UNIT_ROTATIONS_PER_MINUTE
+      ),
+      cv.Optional(CONF_SENS_TOP63): sensor.sensor_schema(
+        unit_of_measurement = UNIT_ROTATIONS_PER_MINUTE
+      ),
+      cv.Optional(CONF_SENS_TOP64): sensor.sensor_schema(
+        unit_of_measurement = UNIT_PRESSURE_KGFCM2
+      ),
+      cv.Optional(CONF_SENS_TOP65): sensor.sensor_schema(
+        unit_of_measurement = UNIT_ROTATIONS_PER_MINUTE
+      ),
+      cv.Optional(CONF_SENS_TOP66): sensor.sensor_schema(
+        unit_of_measurement = UNIT_PRESSURE_KGFCM2
+      ),
+      cv.Optional(CONF_SENS_TOP67): sensor.sensor_schema(
+        unit_of_measurement = UNIT_AMPERE
+      ),
+      cv.Optional(CONF_SENS_TOP70): sensor.sensor_schema(
+        unit_of_measurement = UNIT_CELSIUS
+      ),
+      cv.Optional(CONF_SENS_TOP71): sensor.sensor_schema(
+        unit_of_measurement = UNIT_MINUTE
+      ),
+      cv.Optional(CONF_SENS_TOP72): sensor.sensor_schema(
+        unit_of_measurement = UNIT_CELSIUS
+      ),
+      cv.Optional(CONF_SENS_TOP73): sensor.sensor_schema(
+        unit_of_measurement = UNIT_CELSIUS
+      ),
+      cv.Optional(CONF_SENS_TOP74): sensor.sensor_schema(
+        unit_of_measurement = UNIT_CELSIUS
+      ),
+      cv.Optional(CONF_SENS_TOP75): sensor.sensor_schema(
+        unit_of_measurement = UNIT_CELSIUS
+      ),
+      cv.Optional(CONF_SENS_TOP77): sensor.sensor_schema(
+        unit_of_measurement = UNIT_CELSIUS
+      ),
+      cv.Optional(CONF_SENS_TOP78): sensor.sensor_schema(
+        unit_of_measurement = UNIT_CELSIUS
+      ),
+      cv.Optional(CONF_SENS_TOP79): sensor.sensor_schema(
+        unit_of_measurement = UNIT_CELSIUS
+      ),
+      cv.Optional(CONF_SENS_TOP80): sensor.sensor_schema(
+        unit_of_measurement = UNIT_CELSIUS
+      ),
+      cv.Optional(CONF_SENS_TOP82): sensor.sensor_schema(
+        unit_of_measurement = UNIT_CELSIUS
+      ),
+      cv.Optional(CONF_SENS_TOP83): sensor.sensor_schema(
+        unit_of_measurement = UNIT_CELSIUS
+      ),
+      cv.Optional(CONF_SENS_TOP84): sensor.sensor_schema(
+        unit_of_measurement = UNIT_CELSIUS
+      ),
+      cv.Optional(CONF_SENS_TOP85): sensor.sensor_schema(
+        unit_of_measurement = UNIT_CELSIUS
+      ),
+      cv.Optional(CONF_SENS_TOP86): sensor.sensor_schema(
+        unit_of_measurement = UNIT_CELSIUS
+      ),
+      cv.Optional(CONF_SENS_TOP87): sensor.sensor_schema(
+        unit_of_measurement = UNIT_CELSIUS
+      ),
+      cv.Optional(CONF_SENS_TOP88): sensor.sensor_schema(
+        unit_of_measurement = UNIT_CELSIUS
+      ),
+      cv.Optional(CONF_SENS_TOP89): sensor.sensor_schema(
+        unit_of_measurement = UNIT_CELSIUS
+      ),
+      cv.Optional(CONF_SENS_TOP90): sensor.sensor_schema(
+        unit_of_measurement = UNIT_HOUR
+      ),
+      cv.Optional(CONF_SENS_TOP91): sensor.sensor_schema(
+        unit_of_measurement = UNIT_HOUR
+      ),
       cv.Optional(CONF_SENS_TOP93): sensor.sensor_schema(),
       cv.Optional(CONF_SENS_TOP95): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP96): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP97): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP98): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP102): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP103): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP104): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP105): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP113): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP115): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP116): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP117): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP118): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP119): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP120): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP121): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP122): sensor.sensor_schema(),
-      cv.Optional(CONF_SENS_TOP123): sensor.sensor_schema(),
+      cv.Optional(CONF_SENS_TOP96): sensor.sensor_schema(
+        unit_of_measurement = UNIT_MINUTE
+      ),
+      cv.Optional(CONF_SENS_TOP97): sensor.sensor_schema(
+        unit_of_measurement = UNIT_KELVIN
+      ),
+      cv.Optional(CONF_SENS_TOP98): sensor.sensor_schema(
+        unit_of_measurement = UNIT_KELVIN
+      ),
+      cv.Optional(CONF_SENS_TOP102): sensor.sensor_schema(
+        unit_of_measurement = UNIT_KELVIN
+      ),
+      cv.Optional(CONF_SENS_TOP103): sensor.sensor_schema(
+        unit_of_measurement = UNIT_KELVIN
+      ),
+      cv.Optional(CONF_SENS_TOP104): sensor.sensor_schema(
+        unit_of_measurement = UNIT_CELSIUS
+      ),
+      cv.Optional(CONF_SENS_TOP105): sensor.sensor_schema(
+        unit_of_measurement = UNIT_CELSIUS
+      ),
+      cv.Optional(CONF_SENS_TOP113): sensor.sensor_schema(
+        unit_of_measurement = UNIT_KELVIN
+      ),
+      cv.Optional(CONF_SENS_TOP115): sensor.sensor_schema(
+        unit_of_measurement = UNIT_BAR
+      ),
+      cv.Optional(CONF_SENS_TOP116): sensor.sensor_schema(
+        unit_of_measurement = UNIT_CELSIUS
+      ),
+      cv.Optional(CONF_SENS_TOP117): sensor.sensor_schema(
+        unit_of_measurement = UNIT_CELSIUS
+      ),
+      cv.Optional(CONF_SENS_TOP118): sensor.sensor_schema(
+        unit_of_measurement = UNIT_CELSIUS
+      ),
+      cv.Optional(CONF_SENS_TOP119): sensor.sensor_schema(
+        unit_of_measurement = UNIT_CELSIUS
+      ),
+      cv.Optional(CONF_SENS_TOP120): sensor.sensor_schema(
+        unit_of_measurement = UNIT_CELSIUS
+      ),
+      cv.Optional(CONF_SENS_TOP121): sensor.sensor_schema(
+        unit_of_measurement = UNIT_CELSIUS
+      ),
+      cv.Optional(CONF_SENS_TOP122): sensor.sensor_schema(
+        unit_of_measurement = UNIT_MINUTE
+      ),
+      cv.Optional(CONF_SENS_TOP123): sensor.sensor_schema(
+        unit_of_measurement = UNIT_MINUTE
+      ),
       cv.Optional(CONF_SENS_TOP125): sensor.sensor_schema(),
       cv.Optional(CONF_SENS_TOP126): sensor.sensor_schema(),
     }
diff --git a/example_panasonic_heatpump.yaml b/example_panasonic_heatpump.yaml
index 74a3422..da00d9d 100755
--- a/example_panasonic_heatpump.yaml
+++ b/example_panasonic_heatpump.yaml
@@ -82,277 +82,188 @@ sensor:
   - platform: panasonic_heatpump
     top1:
       name: "Pump Flow"
-      unit_of_measurement: l/min"
     top5:
       name: "Main Inlet Temp"
-      unit_of_measurement: °C"
     top6:
       name: "Main Outlet Temp"
-      unit_of_measurement: °C"
     top7:
       name: "Main Target Temp"
-      unit_of_measurement: °C"
     top8:
       name: "Compressor Freq"
-      unit_of_measurement: Hz"
     top9:
       name: "DHW Target Temp"
-      unit_of_measurement: °C"
     top10:
       name: "DHW Temp"
-      unit_of_measurement: °C"
     top11:
       name: "Operations Hours"
-      unit_of_measurement: h"
     top12:
       name: "Operations Counter"
     top14:
       name: "Outside Temp"
-      unit_of_measurement: °C"
     top15:
       name: "Heat Power Production"
-      unit_of_measurement: W"
     top16:
       name: "Heat Power Consumption"
-      unit_of_measurement: W"
     top21:
       name: "Outside Pipe Temp"
-      unit_of_measurement: °C"
     top22:
       name: "DHW Heat Delta"
-      unit_of_measurement: K"
     top23:
       name: "Heat Delta"
-      unit_of_measurement: K"
     top24:
       name: "Cool Delta"
-      unit_of_measurement: K"
     top25:
       name: "DHW Holiday Shift Temp"
-      unit_of_measurement: K"
     top27:
       name: "Z1 Heat Request Temp"
-      unit_of_measurement: °C"
     top28:
       name: "Z1 Cool Request Temp"
-      unit_of_measurement: °C"
     top29:
       name: "Z1 Heat Curve Target High Temp"
-      unit_of_measurement: °C"
     top30:
       name: "Z1 Heat Curve Target Low Temp"
-      unit_of_measurement: °C"
     top31:
       name: "Z1 Heat Curve Outside High Temp"
-      unit_of_measurement: °C"
     top32:
       name: "Z1 Heat Curve Outside Low Temp"
-      unit_of_measurement: °C"
     top33:
       name: "Room Thermostat Temp"
-      unit_of_measurement: °C"
     top34:
       name: "Z2 Heat Request Temp"
-      unit_of_measurement: °C"
     top35:
       name: "Z2 Cool Request Temp"
-      unit_of_measurement: °C"
     top36:
       name: "Z1 Water Temp"
-      unit_of_measurement: °C"
     top37:
       name: "Z2 Water Temp"
-      unit_of_measurement: °C"
     top38:
       name: "Cool Power Production"
-      unit_of_measurement: W"
     top39:
       name: "Cool Power Consumption"
-      unit_of_measurement: W"
     top40:
       name: "DHW Power Production"
-      unit_of_measurement: W"
     top41:
       name: "DHW Power Consumption"
-      unit_of_measurement: W"
     top42:
       name: "Z1 Water Target Temp"
-      unit_of_measurement: °C"
     top43:
       name: "Z2 Water Target Temp"
-      unit_of_measurement: °C"
     top45:
       name: "Room Holiday Shift Temp"
-      unit_of_measurement: K"
     top46:
       name: "Buffer Temp"
-      unit_of_measurement: °C"
     top47:
       name: "Solar Temp"
-      unit_of_measurement: °C"
     top48:
       name: "Pool Temp"
-      unit_of_measurement: °C"
     top49:
       name: "Main Hex Outlet Temp"
-      unit_of_measurement: °C"
     top50:
       name: "Discharge Temp"
-      unit_of_measurement: °C"
     top51:
       name: "Inside Pipe Temp"
-      unit_of_measurement: °C"
     top52:
       name: "Defrost Temp"
-      unit_of_measurement: °C"
     top53:
       name: "Eva Outlet Temp"
-      unit_of_measurement: °C"
     top54:
       name: "Bypass Outlet Temp"
-      unit_of_measurement: °C"
     top55:
       name: "Ipm Temp"
-      unit_of_measurement: °C"
     top56:
       name: "Z1 Temp"
-      unit_of_measurement: °C"
     top57:
       name: "Z2 Temp"
-      unit_of_measurement: °C"
     top62:
       name: "Fan1 Motor Speed"
-      unit_of_measurement: r/min"
     top63:
       name: "Fan2 Motor Speed"
-      unit_of_measurement: r/min"
     top64:
       name: "High Pressure"
-      unit_of_measurement: kgf/cm²"
     top65:
       name: "Pump Speed"
-      unit_of_measurement: r/min"
     top66:
       name: "Low Pressure"
-      unit_of_measurement: kgf/cm²"
     top67:
       name: "Compressor Current"
-      unit_of_measurement: A"
     top70:
       name: "Sterilization Temp"
-      unit_of_measurement: °C"
     top71:
       name: "Sterilization Max Time"
-      unit_of_measurement: min"
     top72:
       name: "Z1 Cool Curve Target High Temp"
-      unit_of_measurement: °C"
     top73:
       name: "Z1 Cool Curve Target Low Temp"
-      unit_of_measurement: °C"
     top74:
       name: "Z1 Cool Curve Outside High Temp"
-      unit_of_measurement: °C"
     top75:
       name: "Z1 Cool Curve Outside Low Temp"
-      unit_of_measurement: °C"
     top77:
       name: "Heating Off Outdoor Temp"
-      unit_of_measurement: °C"
     top78:
       name: "Heater On Outdoor Temp"
-      unit_of_measurement: °C"
     top79:
       name: "Heat To Cool Temp"
-      unit_of_measurement: °C"
     top80:
       name: "Cool To Heat Temp"
-      unit_of_measurement: °C"
     top82:
       name: "Z2 Heat Curve Target High Temp"
-      unit_of_measurement: °C"
     top83:
       name: "Z2 Heat Curve Target Low Temp"
-      unit_of_measurement: °C"
     top84:
       name: "Z2 Heat Curve Outside High Temp"
-      unit_of_measurement: °C"
     top85:
       name: "Z2 Heat Curve Outside Low Temp"
-      unit_of_measurement: °C"
     top86:
       name: "Z2 Cool Curve Target High Temp"
-      unit_of_measurement: °C"
     top87:
       name: "Z2 Cool Curve Target Low Temp"
-      unit_of_measurement: °C"
     top88:
       name: "Z2 Cool Curve Outside High Temp"
-      unit_of_measurement: °C"
     top89:
       name: "Z2 Cool Curve Outside Low Temp"
-      unit_of_measurement: °C"
     top90:
       name: "Room Heater Operations Hours"
-      unit_of_measurement: h"
     top91:
       name: "DHW Heater Operations Hours"
-      unit_of_measurement: h"
     top93:
       name: "Pump Duty"
     top95:
       name: "Max Pump Duty"
     top96:
       name: "Heater Delay Time"
-      unit_of_measurement: min"
     top97:
       name: "Heater Start Delta"
-      unit_of_measurement: K"
     top98:
       name: "Heater Stop Delta"
-      unit_of_measurement: K"
     top102:
       name: "Solar On Delta"
-      unit_of_measurement: K"
     top103:
       name: "Solar Off Delta"
-      unit_of_measurement: K"
     top104:
       name: "Solar Frost Protection"
-      unit_of_measurement: °C"
     top105:
       name: "Solar High Limit"
-      unit_of_measurement: °C"
     top113:
       name: "Buffer Tank Delta"
-      unit_of_measurement: K"
     top115:
       name: "Water Pressure"
-      unit_of_measurement: bar"
     top116:
       name: "Second Inlet Temp"
-      unit_of_measurement: °C"
     top117:
       name: "Economizer Outlet Temp"
-      unit_of_measurement: °C"
     top118:
       name: "Second Room Thermostat Temp"
-      unit_of_measurement: °C"
     top119:
       name: "Bivalent Heating Start Temperature"
-      unit_of_measurement: °C"
     top120:
       name: "Bivalent Heating Parallel Adv Starttemp"
-      unit_of_measurement: °C"
     top121:
       name: "Bivalent Heating Parallel Adv Stoptemp"
-      unit_of_measurement: °C"
     top122:
       name: "Bivalent Heating Parallel Adv Start Delay"
-      unit_of_measurement: min"
     top123:
       name: "Bivalent Heating Parallel Adv Stop Delay"
-      unit_of_measurement: min"
     top125:
       name: "2 Zone mixing valve 1 opening"
     top126:
@@ -411,8 +322,8 @@ text_sensor:
       name: "Heating Mode"
     top81:
       name: "Cooling Mode"
-    top92:
-      name: "Heat Pump Model"
+    #top92:
+      #name: "Heat Pump Model"
     top94:
       name: "Zones State"
     top101: