diff --git a/main/config_RF.h b/main/config_RF.h
index 6c41275..9aa34fd 100644
--- a/main/config_RF.h
+++ b/main/config_RF.h
@@ -111,10 +111,10 @@ const char parameters[40][4][24] = {
     {"noise", "noise", "dB", ""},
     {"depth_cm", "depth", "cm", ""},
     {"power_W", "power", "W", "power"},
-    {"light_lux", "light", "lx", ""},
-    {"lux", "lux", "lx", ""},
-    {"uv", "uv", "UV index", ""},
-    {"uvi", "uvi", "UV index", ""},
+    {"light_lux", "light", "lx", "illuminance"},
+    {"lux", "lux", "lx", "illuminance"},
+    {"uvi", "UVI", "UV index", ""},
+    {"uv", "UV", "UV level", ""},
     {"storm_dist", "storm distance", "mi", ""},
     {"strike_distance", "strike distance", "mi", ""},
     {"tamper", "tamper", "", ""},
diff --git a/main/config_mqttDiscovery.h b/main/config_mqttDiscovery.h
index 24b1f45..3825c0a 100644
--- a/main/config_mqttDiscovery.h
+++ b/main/config_mqttDiscovery.h
@@ -202,6 +202,8 @@ const char* availableHASSClasses[] = {"battery",
                                       "pm25",
                                       "power",
                                       "power_factor",
+                                      "precipitation",
+                                      "precipitation_intensity",
                                       "pressure",
                                       "problem",
                                       "restart",
@@ -211,6 +213,7 @@ const char* availableHASSClasses[] = {"battery",
                                       "voltage",
                                       "water",
                                       "weight",
+                                      "wind_speed",
                                       "window"};
 
 // From https://github.com/home-assistant/core/blob/d7ac4bd65379e11461c7ce0893d3533d8d8b8cbf/homeassistant/const.py#L379