diff --git a/enoceanmqtt/overlays/homeassistant/mapping.yaml b/enoceanmqtt/overlays/homeassistant/mapping.yaml
index e09432d..ebd2fab 100644
--- a/enoceanmqtt/overlays/homeassistant/mapping.yaml
+++ b/enoceanmqtt/overlays/homeassistant/mapping.yaml
@@ -2736,30 +2736,203 @@
       0x00:
          device_config:
             command: ""
-            channel: "DT"
+            channel: "CH/DT"
             log_learn: ""
             direction: ""
             answer: ""
          entities:
             - component: "sensor"
-              name: "frequency"
+              name: "ch00_counter"
+              config:
+                 state_topic: "CH0.0/DT0"
+                 state_class: "total"
+                 value_template: "{{ value_json.MR/(10**value_json.DIV) }}"
+            - component: "sensor"
+              name: "ch00_current"
               config:
+                 state_topic: "CH0.0/DT1"
                  state_class: "measurement"
-                 state_topic: "DT1"
                  value_template: "{{ value_json.MR/(10**value_json.DIV) }}"
-                 device_class: "frequency"
-                 unit_of_measurement: "Hz"
             - component: "sensor"
-              name: "counter"
+              name: "ch01_counter"
               config:
-                 state_topic: "DT0"
+                 state_topic: "CH1.0/DT0"
                  state_class: "total"
                  value_template: "{{ value_json.MR/(10**value_json.DIV) }}"
             - component: "sensor"
-              name: "channel"
+              name: "ch01_current"
               config:
-                 state_topic: "+"
-                 value_template: "{{ value_json.CH | int(default=0) }}"
+                 state_topic: "CH1.0/DT1"
+                 state_class: "measurement"
+                 value_template: "{{ value_json.MR/(10**value_json.DIV) }}"
+            - component: "sensor"
+              name: "ch02_counter"
+              config:
+                 state_topic: "CH2.0/DT0"
+                 state_class: "total"
+                 value_template: "{{ value_json.MR/(10**value_json.DIV) }}"
+            - component: "sensor"
+              name: "ch02_current"
+              config:
+                 state_topic: "CH2.0/DT1"
+                 state_class: "measurement"
+                 value_template: "{{ value_json.MR/(10**value_json.DIV) }}"
+            - component: "sensor"
+              name: "ch03_counter"
+              config:
+                 state_topic: "CH3.0/DT0"
+                 state_class: "total"
+                 value_template: "{{ value_json.MR/(10**value_json.DIV) }}"
+            - component: "sensor"
+              name: "ch03_current"
+              config:
+                 state_topic: "CH3.0/DT1"
+                 state_class: "measurement"
+                 value_template: "{{ value_json.MR/(10**value_json.DIV) }}"
+            - component: "sensor"
+              name: "ch04_counter"
+              config:
+                 state_topic: "CH4.0/DT0"
+                 state_class: "total"
+                 value_template: "{{ value_json.MR/(10**value_json.DIV) }}"
+            - component: "sensor"
+              name: "ch04_current"
+              config:
+                 state_topic: "CH4.0/DT1"
+                 state_class: "measurement"
+                 value_template: "{{ value_json.MR/(10**value_json.DIV) }}"
+            - component: "sensor"
+              name: "ch05_counter"
+              config:
+                 state_topic: "CH5.0/DT0"
+                 state_class: "total"
+                 value_template: "{{ value_json.MR/(10**value_json.DIV) }}"
+            - component: "sensor"
+              name: "ch05_current"
+              config:
+                 state_topic: "CH5.0/DT1"
+                 state_class: "measurement"
+                 value_template: "{{ value_json.MR/(10**value_json.DIV) }}"
+            - component: "sensor"
+              name: "ch06_counter"
+              config:
+                 state_topic: "CH6.0/DT0"
+                 state_class: "total"
+                 value_template: "{{ value_json.MR/(10**value_json.DIV) }}"
+            - component: "sensor"
+              name: "ch06_current"
+              config:
+                 state_topic: "CH6.0/DT1"
+                 state_class: "measurement"
+                 value_template: "{{ value_json.MR/(10**value_json.DIV) }}"
+            - component: "sensor"
+              name: "ch07_counter"
+              config:
+                 state_topic: "CH7.0/DT0"
+                 state_class: "total"
+                 value_template: "{{ value_json.MR/(10**value_json.DIV) }}"
+            - component: "sensor"
+              name: "ch07_current"
+              config:
+                 state_topic: "CH7.0/DT1"
+                 state_class: "measurement"
+                 value_template: "{{ value_json.MR/(10**value_json.DIV) }}"
+            - component: "sensor"
+              name: "ch08_counter"
+              config:
+                 state_topic: "CH8.0/DT0"
+                 state_class: "total"
+                 value_template: "{{ value_json.MR/(10**value_json.DIV) }}"
+            - component: "sensor"
+              name: "ch08_current"
+              config:
+                 state_topic: "CH8.0/DT1"
+                 state_class: "measurement"
+                 value_template: "{{ value_json.MR/(10**value_json.DIV) }}"
+            - component: "sensor"
+              name: "ch09_counter"
+              config:
+                 state_topic: "CH9.0/DT0"
+                 state_class: "total"
+                 value_template: "{{ value_json.MR/(10**value_json.DIV) }}"
+            - component: "sensor"
+              name: "ch09_current"
+              config:
+                 state_topic: "CH9.0/DT1"
+                 state_class: "measurement"
+                 value_template: "{{ value_json.MR/(10**value_json.DIV) }}"
+            - component: "sensor"
+              name: "ch10_counter"
+              config:
+                 state_topic: "CH10.0/DT0"
+                 state_class: "total"
+                 value_template: "{{ value_json.MR/(10**value_json.DIV) }}"
+            - component: "sensor"
+              name: "ch10_current"
+              config:
+                 state_topic: "CH10.0/DT1"
+                 state_class: "measurement"
+                 value_template: "{{ value_json.MR/(10**value_json.DIV) }}"
+            - component: "sensor"
+              name: "ch11_counter"
+              config:
+                 state_topic: "CH11.0/DT0"
+                 state_class: "total"
+                 value_template: "{{ value_json.MR/(10**value_json.DIV) }}"
+            - component: "sensor"
+              name: "ch11_current"
+              config:
+                 state_topic: "CH11.0/DT1"
+                 state_class: "measurement"
+                 value_template: "{{ value_json.MR/(10**value_json.DIV) }}"
+            - component: "sensor"
+              name: "ch12_counter"
+              config:
+                 state_topic: "CH12.0/DT0"
+                 state_class: "total"
+                 value_template: "{{ value_json.MR/(10**value_json.DIV) }}"
+            - component: "sensor"
+              name: "ch12_current"
+              config:
+                 state_topic: "CH12.0/DT1"
+                 state_class: "measurement"
+                 value_template: "{{ value_json.MR/(10**value_json.DIV) }}"
+            - component: "sensor"
+              name: "ch13_counter"
+              config:
+                 state_topic: "CH13.0/DT0"
+                 state_class: "total"
+                 value_template: "{{ value_json.MR/(10**value_json.DIV) }}"
+            - component: "sensor"
+              name: "ch13_current"
+              config:
+                 state_topic: "CH13.0/DT1"
+                 state_class: "measurement"
+                 value_template: "{{ value_json.MR/(10**value_json.DIV) }}"
+            - component: "sensor"
+              name: "ch14_counter"
+              config:
+                 state_topic: "CH14.0/DT0"
+                 state_class: "total"
+                 value_template: "{{ value_json.MR/(10**value_json.DIV) }}"
+            - component: "sensor"
+              name: "ch14_current"
+              config:
+                 state_topic: "CH14.0/DT1"
+                 state_class: "measurement"
+                 value_template: "{{ value_json.MR/(10**value_json.DIV) }}"
+            - component: "sensor"
+              name: "ch15_counter"
+              config:
+                 state_topic: "CH15.0/DT0"
+                 state_class: "total"
+                 value_template: "{{ value_json.MR/(10**value_json.DIV) }}"
+            - component: "sensor"
+              name: "ch15_current"
+              config:
+                 state_topic: "CH15.0/DT1"
+                 state_class: "measurement"
+                 value_template: "{{ value_json.MR/(10**value_json.DIV) }}"
       0x01:
          device_config:
             command: ""