diff --git a/Integrations/Home Assistant/heishamon.yaml b/Integrations/Home Assistant/heishamon.yaml
index dff642bd..d06a19d1 100644
--- a/Integrations/Home Assistant/heishamon.yaml	
+++ b/Integrations/Home Assistant/heishamon.yaml	
@@ -305,35 +305,47 @@ sensor:
     name: Aquarea Actual Tank Temperature
     state_topic: "panasonic_heat_pump/main/DHW_Temp"
     unit_of_measurement: '°C'
+    state_class: 'measurement'
 
   #TOP11 - Compressor Operating Time
   - platform: mqtt
     name: Aquarea Compressor Operating Hours
     state_topic: "panasonic_heat_pump/main/Operations_Hours"
     unit_of_measurement: 'Hours'
+    state_class: total
 
   #TOP12 - Compressor On/Off cycle number
   - platform: mqtt
     name: Aquarea Compressor Start/Stop Counter
     state_topic: "panasonic_heat_pump/main/Operations_Counter"
+    state_class: total
+
 
   #TOP14 - Outdoor unit ambient temperature
   - platform: mqtt
     name: Aquarea Outdoor Ambient
     state_topic: "panasonic_heat_pump/main/Outside_Temp"
     unit_of_measurement: '°C'
+    state_class: 'measurement'
 
   #TOP15 - Heating power produced
   - platform: mqtt
     name: Aquarea Power Produced
     state_topic: "panasonic_heat_pump/main/Heat_Energy_Production"
     unit_of_measurement: 'W'
+    device_class: 'power'
+    state_class: 'measurement'
+    force_update: true
 
   #TOP16 - Heating power consumed
   - platform: mqtt
     name: Aquarea Power Consumed
     state_topic: "panasonic_heat_pump/main/Heat_Energy_Consumption"
     unit_of_measurement: 'W'
+    device_class: 'power'
+    state_class: 'measurement'
+    force_update: true
+
 
   #TOP17 - Heating powerful mode
   - platform: mqtt
@@ -406,12 +418,18 @@ sensor:
     name: Aquarea DHW Power Produced
     state_topic: "panasonic_heat_pump/main/DHW_Energy_Production"
     unit_of_measurement: 'W'
+    device_class: 'power'
+    state_class: 'measurement'
+    force_update: true
 
   #TOP41 - DHW power consumed
   - platform: mqtt
     name: Aquarea DHW Power Consumed
     state_topic: "panasonic_heat_pump/main/DHW_Energy_Consumption"
     unit_of_measurement: 'W'
+    device_class: 'power'
+    state_class: 'measurement'
+    force_update: true
 
   #TOP44 - Last active error
   - platform: mqtt
@@ -606,16 +624,33 @@ sensor:
         friendly_name: "Aquarea COP"
         unit_of_measurement: "x"
         value_template: >-
-          {%- if states('sensor.heishamon_w_production') != "Unknown" -%}
-            {%- if states('sensor.heishamon_w_consumption') > "0" -%}
-              {{ '%0.1f' % ((states('sensor.heishamon_w_production') | float ) / (states('sensor.heishamon_w_consumption') | float)) }}
-            {%- else -%}
-              0.0
-            {%- endif -%}
+          {%- if states('sensor.heishamon_w_consumption') | float > 0 -%}
+            {{ '%0.1f' % ((states('sensor.heishamon_w_production') | float ) / (states('sensor.heishamon_w_consumption') | float )) }}
           {%- else -%}
-            n/a
+            0.0
           {%- endif -%}
 
+        availability_template: >-
+          {%- if is_number(states('sensor.heishamon_w_consumption')) and is_number(states('sensor.heishamon_w_production')) %}
+            true
+          {%- else %}
+            false
+          {%- endif %}
+
+
+  #Calculation Energy consumed (kWh) - DHW
+  - platform: integration
+    source: sensor.aquarea_dhw_power_consumed
+    name: Aquarea DHW Energy Consumed
+    unit_prefix: k
+    method: left
+  #Calculation Energy consumed (kWh) - Heat    
+  - platform: integration
+    source: sensor.aquarea_power_consumed
+    name: Aquarea Heat Energy Consumed
+    unit_prefix: k
+    method: left
+
 
 
 # switch #
diff --git a/README.md b/README.md
index 2f5e44bb..0a6646f6 100644
--- a/README.md
+++ b/README.md
@@ -36,7 +36,6 @@ A json output of all received data (heatpump and 1wire) is available at the url
 
 Within the 'integrations' folder you can find examples how to connect your automation platform to the HeishaMon.
 
-
 # Rules functionality
 The rules functionality allows you to control the heatpump from within the HeishaMon itself. Which makes it much more reliable then having to deal with external domotica over WiFi. When posting a new ruleset, it is immidiatly validated and when valid used. When a new ruleset is invalid it will be ignored and the old ruleset will be loaded again. You can check the console for feedback on this. If somehow a new valid ruleset crashes the HeishaMon, it will be automatically disabled the next reboot allowing you to make changes. This prevents the HeishaMon getting into a boot loop.