diff --git a/ucapi/entities.py b/ucapi/entities.py
index efa1ebb..ea8f598 100644
--- a/ucapi/entities.py
+++ b/ucapi/entities.py
@@ -102,9 +102,13 @@ def get_all(self) -> list[dict[str, Any]]:
                 "device_id": entity.device_id,
                 "features": entity.features,
                 "name": entity.name,
-                "area": entity.area,
-                "device_class": entity.device_class,
             }
+            if entity.device_class:
+                res["device_class"] = entity.device_class
+            if entity.options:
+                res["options"] = entity.options
+            if entity.area:
+                res["area"] = entity.area
 
             entities.append(res)