diff --git a/custom_components/saj_esolar/sensor.py b/custom_components/saj_esolar/sensor.py
index 37a25fc..d44fda6 100644
--- a/custom_components/saj_esolar/sensor.py
+++ b/custom_components/saj_esolar/sensor.py
@@ -28,9 +28,9 @@
     CONF_USERNAME,
     CONF_PASSWORD,
     CONF_SENSORS,
-    ENERGY_KILO_WATT_HOUR,
-    POWER_WATT,
     PERCENTAGE,
+    UnitOfEnergy,
+    UnitOfPower,
 )
 
 CONF_PLANT_ID: Final = "plant_id"
@@ -131,7 +131,7 @@ def add_years(d, years):
         key="nowPower",
         name="nowPower",
         icon="mdi:solar-power",
-        native_unit_of_measurement=POWER_WATT,
+        native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
     ),
     SensorEntityDescription(
@@ -148,28 +148,28 @@ def add_years(d, years):
         key="todayElectricity",
         name="todayElectricity",
         icon="mdi:solar-panel-large",
-        native_unit_of_measurement=ENERGY_KILO_WATT_HOUR,
+        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
     ),
     SensorEntityDescription(
         key="monthElectricity",
         name="monthElectricity",
         icon="mdi:solar-panel-large",
-        native_unit_of_measurement=ENERGY_KILO_WATT_HOUR,
+        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
     ),
     SensorEntityDescription(
         key="yearElectricity",
         name="yearElectricity",
         icon="mdi:solar-panel-large",
-        native_unit_of_measurement=ENERGY_KILO_WATT_HOUR,
+        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
     ),
     SensorEntityDescription(
         key="totalElectricity",
         name="totalElectricity",
         icon="mdi:solar-panel-large",
-        native_unit_of_measurement=ENERGY_KILO_WATT_HOUR,
+        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
     ),
@@ -182,7 +182,7 @@ def add_years(d, years):
         key="totalBuyElec",
         name="totalBuyElec",
         icon="mdi:solar-panel",
-        native_unit_of_measurement=ENERGY_KILO_WATT_HOUR,
+        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
     ),
@@ -190,14 +190,14 @@ def add_years(d, years):
         key="totalConsumpElec",
         name="totalConsumpElec",
         icon="mdi:solar-panel",
-        native_unit_of_measurement=ENERGY_KILO_WATT_HOUR,
+        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
     ),
     SensorEntityDescription(
         key="totalSellElec",
         name="totalSellElec",
         icon="mdi:solar-panel",
-        native_unit_of_measurement=ENERGY_KILO_WATT_HOUR,
+        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
     ),
@@ -265,28 +265,28 @@ def add_years(d, years):
         key="peakPower",
         name="peakPower",
         icon="mdi:solar-panel",
-        native_unit_of_measurement=POWER_WATT,
+        native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
     ),
     SensorEntityDescription(
         key="systemPower",
         name="systemPower",
         icon="mdi:solar-panel",
-        native_unit_of_measurement=POWER_WATT,
+        native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
     ),    
     SensorEntityDescription(
         key="pvElec",
         name="pvElec",
         icon="mdi:solar-panel-large",
-        native_unit_of_measurement=ENERGY_KILO_WATT_HOUR,
+        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
     ),
     SensorEntityDescription(
         key="useElec",
         name="useElec",
         icon="mdi:solar-panel-large",
-        native_unit_of_measurement=ENERGY_KILO_WATT_HOUR,
+        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
     ),
@@ -294,7 +294,7 @@ def add_years(d, years):
         key="buyElec",
         name="buyElec",
         icon="mdi:solar-panel-large",
-        native_unit_of_measurement=ENERGY_KILO_WATT_HOUR,
+        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
     ),
@@ -302,7 +302,7 @@ def add_years(d, years):
         key="sellElec",
         name="sellElec",
         icon="mdi:solar-panel-large",
-        native_unit_of_measurement=ENERGY_KILO_WATT_HOUR,
+        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
     ),
@@ -330,14 +330,14 @@ def add_years(d, years):
         key="selfConsumedEnergy1",
         name="selfConsumedEnergy1",
         icon="mdi:solar-panel-large",
-        native_unit_of_measurement=ENERGY_KILO_WATT_HOUR,
+        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
     ),
     SensorEntityDescription(
         key="selfConsumedEnergy2",
         name="selfConsumedEnergy2",
         icon="mdi:solar-panel-large",
-        native_unit_of_measurement=ENERGY_KILO_WATT_HOUR,
+        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
     ),
     SensorEntityDescription(
@@ -354,26 +354,26 @@ def add_years(d, years):
         key="totalGridPower",
         name="totalGridPower",
         icon="mdi:solar-panel",
-        native_unit_of_measurement=POWER_WATT,
+        native_unit_of_measurement=UnitOfPower.WATT,
     ),
     SensorEntityDescription(
         key="totalLoadPower",
         name="totalLoadPower",
         icon="mdi:solar-panel",
-        native_unit_of_measurement=POWER_WATT,
+        native_unit_of_measurement=UnitOfPower.WATT,
         device_class=SensorDeviceClass.POWER,
     ),
     SensorEntityDescription(
         key="totalPvgenPower",
         name="totalPvgenPower",
         icon="mdi:solar-panel",
-        native_unit_of_measurement=POWER_WATT,
+        native_unit_of_measurement=UnitOfPower.WATT,
     ),
     SensorEntityDescription(
         key="totalPvEnergy",
         name="totalPvEnergy",
         icon="mdi:solar-panel-large",
-        native_unit_of_measurement=ENERGY_KILO_WATT_HOUR,
+        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
     ),
@@ -381,7 +381,7 @@ def add_years(d, years):
         key="totalLoadEnergy",
         name="totalLoadEnergy",
         icon="mdi:solar-panel-large",
-        native_unit_of_measurement=ENERGY_KILO_WATT_HOUR,
+        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
     ),
@@ -389,7 +389,7 @@ def add_years(d, years):
         key="totalBuyEnergy",
         name="totalBuyEnergy",
         icon="mdi:solar-panel-large",
-        native_unit_of_measurement=ENERGY_KILO_WATT_HOUR,
+        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
     ),
@@ -397,7 +397,7 @@ def add_years(d, years):
         key="totalSellEnergy",
         name="totalSellEnergy",
         icon="mdi:solar-panel-large",
-        native_unit_of_measurement=ENERGY_KILO_WATT_HOUR,
+        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
     ),
@@ -434,13 +434,13 @@ def add_years(d, years):
         key="batteryPower",
         name="batteryPower",
         icon="mdi:solar-panel-large",
-        native_unit_of_measurement=POWER_WATT,
+        native_unit_of_measurement=UnitOfPower.WATT,
     ),
     SensorEntityDescription(
         key="gridPower",
         name="gridPower",
         icon="mdi:solar-panel-large",
-        native_unit_of_measurement=POWER_WATT,
+        native_unit_of_measurement=UnitOfPower.WATT,
     ),
     SensorEntityDescription(
         key="gridDirection",
@@ -456,7 +456,7 @@ def add_years(d, years):
         key="outPower",
         name="outPower",
         icon="mdi:solar-panel-large",
-        native_unit_of_measurement=POWER_WATT,
+        native_unit_of_measurement=UnitOfPower.WATT,
     ),
     SensorEntityDescription(
         key="outPutDirection",
@@ -477,7 +477,7 @@ def add_years(d, years):
         key="chargeElec",
         name="chargeElec",
         icon="mdi:solar-panel-large",
-        native_unit_of_measurement=ENERGY_KILO_WATT_HOUR,
+        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
     ),
@@ -485,7 +485,7 @@ def add_years(d, years):
         key="dischargeElec",
         name="dischargeElec",
         icon="mdi:solar-panel-large",
-        native_unit_of_measurement=ENERGY_KILO_WATT_HOUR,
+        native_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
         device_class=SensorDeviceClass.ENERGY,
         state_class=SensorStateClass.TOTAL_INCREASING,
     ),