diff --git a/collect.py b/collect.py
index e019516..b8483f1 100644
--- a/collect.py
+++ b/collect.py
@@ -40,17 +40,20 @@ Sample output record
 {
   "ts": "2026-05-25T10:05:00+00:00",
   "charging": {
-    "chargingStatus":   { "chargingState": "readyForCharging", ... },
-    "batteryStatus":    { "currentSOC_pct": 80, "cruisingRangeElectric_km": 295 },
-    "chargingSettings": { "targetSOC_pct": 80, ... },
+    "chargingStatus":   { "chargingState": "readyForCharging",
+                          "chargePower": {"value": 9.5, "unit": "kW"}, ... },
+    "batteryStatus":    { "currentSOC": {"value": 80, "unit": "%"},
+                          "cruisingRangeElectric": {"value": 295, "unit": "km"} },
+    "chargingSettings": { "targetSOC": {"value": 80, "unit": "%"}, ... },
     "plugStatus":       { "plugConnectionState": "disconnected", ... }
   },
   "measurements": {
-    "odometerStatus":            { "odometer": 12345 },
-    "rangeStatus":               { "electricRange": 295, "totalRange_km": 295 },
-    "batteryStatus":             { "temperatureBatteryMax_K": 295.15,
-                                   "temperatureBatteryMin_K": 293.15 },
-    "temperatureOutsideStatus":  { "temperatureOutside_C": 18.0 }
+    "odometerStatus":           { "odometer": {"value": 12345, "unit": "km"} },
+    "rangeStatus":              { "electricRange": {"value": 295, "unit": "km"},
+                                  "totalRange":    {"value": 295, "unit": "km"} },
+    "temperatureBatteryStatus": { "temperatureHvBatteryMax": {"value": 22.0, "unit": "degC"},
+                                  "temperatureHvBatteryMin": {"value": 20.0, "unit": "degC"} },
+    "temperatureOutsideStatus": { "temperatureOutside": {"value": 18.0, "unit": "degC"} }
   },
   "readiness": {
     "readinessStatus": {
@@ -96,6 +99,10 @@ def _str(v) -> str:
     return str(v.value) if hasattr(v, "value") else str(v)
 
 
+def _phys(value, unit: str) -> dict:
+    return {"value": value, "unit": unit}
+
+
 # ── domain extractors ────────────────────────────────────────────────────────
 # Each function returns a dict whose keys are the WeConnect status-object names
 # and whose values are dicts of field-name → value — mirroring the API layout.
@@ -113,8 +120,8 @@ def extract_charging(vehicle) -> dict | None:
         cs = d["chargingStatus"]
         result["chargingStatus"] = {
             "chargingState": _str(cs.chargingState),
-            "chargePower_kW": cs.chargePower_kW.value,
-            "remainingChargingTimeToComplete_min": cs.remainingChargingTimeToComplete_min.value,
+            "chargePower": _phys(cs.chargePower_kW.value, "kW"),
+            "remainingChargingTimeToComplete": _phys(cs.remainingChargingTimeToComplete_min.value, "min"),
             "chargeType": _str(cs.chargeType),
         }
     except Exception:
@@ -123,8 +130,8 @@ def extract_charging(vehicle) -> dict | None:
     try:
         bs = d["batteryStatus"]
         result["batteryStatus"] = {
-            "currentSOC_pct": bs.currentSOC_pct.value,
-            "cruisingRangeElectric_km": bs.cruisingRangeElectric_km.value,
+            "currentSOC": _phys(bs.currentSOC_pct.value, "%"),
+            "cruisingRangeElectric": _phys(bs.cruisingRangeElectric_km.value, "km"),
         }
     except Exception:
         log.debug("charging/batteryStatus unavailable", exc_info=True)
@@ -132,7 +139,7 @@ def extract_charging(vehicle) -> dict | None:
     try:
         cfg = d["chargingSettings"]
         result["chargingSettings"] = {
-            "targetSOC_pct": cfg.targetSOC_pct.value,
+            "targetSOC": _phys(cfg.targetSOC_pct.value, "%"),
             "maxChargeCurrentAC": _str(cfg.maxChargeCurrentAC),
             "autoUnlockPlugWhenCharged": _str(cfg.autoUnlockPlugWhenCharged),
         }
@@ -164,7 +171,7 @@ def extract_climatisation(vehicle) -> dict | None:
         cl = d["climatisationStatus"]
         result["climatisationStatus"] = {
             "climatisationState": _str(cl.climatisationState),
-            "remainingClimatisationTime_min": cl.remainingClimatisationTime_min.value,
+            "remainingClimatisationTime": _phys(cl.remainingClimatisationTime_min.value, "min"),
         }
     except Exception:
         log.debug("climatisationStatus unavailable", exc_info=True)
@@ -172,7 +179,7 @@ def extract_climatisation(vehicle) -> dict | None:
     try:
         cs = d["climatisationSettings"]
         result["climatisationSettings"] = {
-            "targetTemperature_C": cs.targetTemperature_C.value,
+            "targetTemperature": _phys(cs.targetTemperature_C.value, "degC"),
             "unitInCar": _str(cs.unitInCar),
         }
     except Exception:
@@ -200,15 +207,15 @@ def extract_measurements(vehicle) -> dict | None:
 
     try:
         od = d["odometerStatus"]
-        result["odometerStatus"] = {"odometer": od.odometer.value}
+        result["odometerStatus"] = {"odometer": _phys(od.odometer.value, "km")}
     except Exception:
         log.debug("odometerStatus unavailable", exc_info=True)
 
     try:
         rs = d["rangeStatus"]
         result["rangeStatus"] = {
-            "electricRange": rs.electricRange.value,
-            "totalRange_km": rs.totalRange_km.value,
+            "electricRange": _phys(rs.electricRange.value, "km"),
+            "totalRange": _phys(rs.totalRange_km.value, "km"),
         }
     except Exception:
         log.debug("rangeStatus unavailable", exc_info=True)
@@ -217,8 +224,8 @@ def extract_measurements(vehicle) -> dict | None:
     try:
         bs = d["temperatureBatteryStatus"]
         result["temperatureBatteryStatus"] = {
-            "temperatureHvBatteryMax_K": float(bs.temperatureHvBatteryMax_K.value - 273.15),
-            "temperatureHvBatteryMin_K": float(bs.temperatureHvBatteryMin_K.value - 273.15),
+            "temperatureHvBatteryMax": _phys(float(bs.temperatureHvBatteryMax_K.value - 273.15), "degC"),
+            "temperatureHvBatteryMin": _phys(float(bs.temperatureHvBatteryMin_K.value - 273.15), "degC"),
         }
     except Exception:
         log.debug("measurements/temperatureBatteryStatus (temperature) unavailable", exc_info=True)
@@ -226,7 +233,7 @@ def extract_measurements(vehicle) -> dict | None:
     try:
         temp = d["temperatureOutsideStatus"]
         result["temperatureOutsideStatus"] = {
-            "temperatureOutside_C": temp.temperatureOutside_C.value,
+            "temperatureOutside": _phys(temp.temperatureOutside_C.value, "degC"),
         }
     except Exception:
         log.debug("temperatureOutsideStatus unavailable", exc_info=True)