@@ -614,12 +614,8 @@ async def state(ctx, dev: Device):
 
     echo("\n\t[bold]== Device-specific information == [/bold]")
     for id_, feature in dev.features.items():
-        echo(f"\t{feature.name} ({id_}): {feature.value}")
-
-    if dev.has_emeter:
-        echo("\n\t[bold]== Current State ==[/bold]")
-        emeter_status = dev.emeter_realtime
-        echo(f"\t{emeter_status}")
+        unit = f" {feature.unit}" if feature.unit else ""
+        echo(f"\t{feature.name} ({id_}): {feature.value}{unit}")
 
     echo("\n\t[bold]== Modules ==[/bold]")
     for module in dev.modules.values():
 
@@ -36,6 +36,8 @@ class Feature:
     container: Any = None
     #: Icon suggestion
     icon: str | None = None
+    #: Unit, if applicable
+    unit: Optional[str] = None
     #: Type of the feature
     type: FeatureType = FeatureType.Sensor
 
 
@@ -4,7 +4,6 @@
 
 from typing import TYPE_CHECKING
 
-from ...emeterstatus import EmeterStatus
 from ...feature import Feature
 from ..smartmodule import SmartModule
 
@@ -25,24 +24,27 @@ def __init__(self, device: SmartDevice, module: str):
                 name="Current consumption",
                 attribute_getter="current_power",
                 container=self,
+                unit="W",
             )
-        )  # W or mW?
+        )
         self._add_feature(
             Feature(
                 device,
                 name="Today's consumption",
                 attribute_getter="emeter_today",
                 container=self,
+                unit="Wh",
             )
-        )  # Wh or kWh?
+        )
         self._add_feature(
             Feature(
                 device,
                 name="This month's consumption",
                 attribute_getter="emeter_this_month",
                 container=self,
+                unit="Wh",
             )
-        )  # Wh or kWH?
+        )
 
     def query(self) -> dict:
         """Query to execute during the update cycle."""
@@ -54,9 +56,11 @@ def query(self) -> dict:
         return req
 
     @property
-    def current_power(self):
-        """Current power."""
-        return self.emeter_realtime.power
+    def current_power(self) -> Optional[float]:
+        """Current power in watts."""
+        if power := self.energy.get("current_power"):
+            return power / 1_000
+        return None
 
     @property
     def energy(self):
@@ -65,29 +69,12 @@ def energy(self):
             return en
         return self.data
 
-    @property
-    def emeter_realtime(self):
-        """Get the emeter status."""
-        # TODO: Perhaps we should get rid of emeterstatus altogether for smartdevices
-        return EmeterStatus(
-            {
-                "power_mw": self.energy.get("current_power"),
-                "total": self._convert_energy_data(
-                    self.energy.get("today_energy"), 1 / 1000
-                ),
-            }
-        )
-
     @property
     def emeter_this_month(self) -> float | None:
         """Get the emeter value for this month."""
-        return self._convert_energy_data(self.energy.get("month_energy"), 1 / 1000)
+        return self.energy.get("month_energy")
 
     @property
     def emeter_today(self) -> float | None:
         """Get the emeter value for today."""
-        return self._convert_energy_data(self.energy.get("today_energy"), 1 / 1000)
-
-    def _convert_energy_data(self, data, scale) -> float | None:
-        """Return adjusted emeter information."""
-        return data if not data else data * scale
+        return self.energy.get("today_energy")