diff --git a/contrib/etc/ebusd/mqtt-hassio.cfg b/contrib/etc/ebusd/mqtt-hassio.cfg
index 9dc8b4e8..4dad2815 100644
--- a/contrib/etc/ebusd/mqtt-hassio.cfg
+++ b/contrib/etc/ebusd/mqtt-hassio.cfg
@@ -154,8 +154,8 @@ type_switch-names = type_topic,type_class,type_state
 # HA integration: the mapping list for (potentially) writable number entities by field type, name, message, and unit.
 type_switch-w-number =
     number,temperature, = temp|,°C$
-    number,power, = power|,kW$|,W$
     number,power_factor, = power*%%
+    number,power, = power|,kW$|,W$
     number,voltage, = volt|,V$
     number,current, = current,|,A$
     number,pressure, = bar$
@@ -165,12 +165,14 @@ type_switch-w-number =
 # HA integration: the mapping list for numeric sensor entities by field type, name, message, and unit.
 type_switch-number =
     sensor,temperature,measurement = temp|,°C$
-    sensor,power,measurement = power|,kW$|,W$
     sensor,power_factor,measurement = power*%%
+    sensor,power,measurement = power|,kW$|,W$
     sensor,voltage,measurement = volt|,V$
     sensor,current,measurement = current,|,A$
     sensor,energy,total_increasing = energy|,Wh$
     sensor,yield,total_increasing = total*,Wh$
+    sensor,,total_increasing = hours|,h$
+    sensor,,total_increasing = starts*,$
     sensor,pressure,measurement = bar$
     sensor,gas,measurement = gas*/min$
     sensor,humidity,measurement = humid*%%$
@@ -199,6 +201,10 @@ type_switch-list =
 type_class_number ?= ,
   "device_class":"%type_class"
 
+# HA integration: optional variable with the entity device class for sensors
+type_class_sensor ?= ,
+  "device_class":"%type_class"
+
 # HA integration: optional variable with the entity state class
 state_class ?= ,
   "state_class":"%type_state"