diff --git a/HADiscovery.py b/HADiscovery.py
index bb363e6..01b3c9d 100644
--- a/HADiscovery.py
+++ b/HADiscovery.py
@@ -12,6 +12,74 @@ def decamelcase(str):
 HA_DISCOVERY_PREFIX = "homeassistant"
 
 
+MAGIC_OVERRIDES = {
+    "BackendConnected": {
+        "component_type": "binary_sensor",
+        "payload_values": {
+            "device_class": "connectivity",
+            "payload_on": True,
+            "payload_off": False
+        }
+    },
+    "SoftwareUpdateAvailable": {
+        "component_type": "binary_sensor",
+        "payload_values": {
+            "device_class": "update",
+            "payload_on": "Present"
+        }
+    },
+    "DoorState": {
+        "component_type": "binary_sensor",
+        "payload_values": {
+            "device_class": "door",
+            "payload_on": "Open",
+            "payload_off": "Closed"
+        }
+    },
+    "PowerState": {
+        "component_type": "binary_sensor",
+        "payload_values": {
+            "device_class": "power"
+        }
+    },
+    "RinseAidLack": {
+        "component_type": "binary_sensor",
+        "payload_values": {
+            "device_class": "problem",
+            "payload_on": "Present"
+        }
+    },
+    "SaltLack": {
+        "component_type": "binary_sensor",
+        "payload_values": {
+            "device_class": "problem",
+            "payload_on": "Present"
+        }
+    },
+    "RinseAidNearlyEmpty": {
+        "component_type": "binary_sensor",
+        "payload_values": {
+            "device_class": "problem",
+            "payload_on": "Present"
+        }
+    },
+    "SaltNearlyEmpty": {
+        "component_type": "binary_sensor",
+        "payload_values": {
+            "device_class": "problem",
+            "payload_on": "Present"
+        }
+    },
+    "WaterheaterCalcified": {
+        "component_type": "binary_sensor",
+        "payload_values": {
+            "device_class": "problem",
+            "payload_on": "Present"
+        }
+    },
+}
+
+
 def publish_ha_discovery(device, client, mqtt_topic):
     print(f"{now()} Publishing HA discovery for {device}")
 
@@ -43,10 +111,17 @@ def publish_ha_discovery(device, client, mqtt_topic):
         available = feature.get("available", False)
 
         if (feature_type == "Setting" and available and (access == "read" or access == "readWrite")) or \
+            (feature_type == "Status" and available and (access == "read" or access == "readWrite")) or \
             feature_type == "Event" or \
             feature_type == "Option":
 
-            component_type = "binary_sensor" if feature_type == "Event" else "sensor" # TODO use more appropriate types
+            default_component_type = "binary_sensor" if feature_type == "Event" else "sensor" # TODO use more appropriate types
+
+            overrides = MAGIC_OVERRIDES.get(name, {})
+
+            component_type = overrides.get("component_type", default_component_type)
+
+            extra_payload_values = overrides.get("payload_values", {})
 
             discovery_topic = f"{HA_DISCOVERY_PREFIX}/{component_type}/hcpy/{device_ident}_{name}/config"
             # print(discovery_topic, state_topic)
@@ -56,16 +131,17 @@ def publish_ha_discovery(device, client, mqtt_topic):
                 "device": device_info,
                 "state_topic": f"{mqtt_topic}/state",
                 # "availability_topic": f"{mqtt_topic}/LWT",
-                "value_template": "{{value_json." + name + "}}",
+                "value_template": "{{value_json." + name + " | default('unavailable')}}",
                 "object_id": f"{device_ident}_{name}",
                 "unique_id": f"{device_ident}_{name}",
+                **extra_payload_values
             }
 
             if component_type == "binary_sensor":
-                discovery_payload["payload_on"] = "On"
-                discovery_payload["payload_off"] = "Off"
+                discovery_payload.setdefault("payload_on", "On")
+                discovery_payload.setdefault("payload_off", "Off")
 
-            print(discovery_topic)
+            # print(discovery_topic)
             # print(discovery_payload)
 
             client.publish(discovery_topic, json.dumps(discovery_payload), retain=True)