diff --git a/main/config_mqttDiscovery.h b/main/config_mqttDiscovery.h
index 65ee871..034167a 100644
--- a/main/config_mqttDiscovery.h
+++ b/main/config_mqttDiscovery.h
@@ -191,7 +191,8 @@ char discovery_prefix[parameters_size + 1] = discovery_Prefix;
 
 // From https://github.com/home-assistant/core/blob/d7ac4bd65379e11461c7ce0893d3533d8d8b8cbf/homeassistant/const.py#L225
 // List of classes available in Home Assistant
-const char* availableHASSClasses[] = {"battery",
+const char* availableHASSClasses[] = {"battery_charging",
+                                      "battery",
                                       "carbon_dioxide",
                                       "carbon_monoxide",
                                       "current",
@@ -211,10 +212,10 @@ const char* availableHASSClasses[] = {"battery",
                                       "pm1",
                                       "pm10",
                                       "pm25",
-                                      "power",
                                       "power_factor",
-                                      "precipitation",
+                                      "power",
                                       "precipitation_intensity",
+                                      "precipitation",
                                       "pressure",
                                       "problem",
                                       "restart",