diff --git a/.homeycompose/app.json b/.homeycompose/app.json
index 95b9fd3..b827550 100644
--- a/.homeycompose/app.json
+++ b/.homeycompose/app.json
@@ -33,7 +33,8 @@
   "contributors": {
     "developers": [
       {
-        "name": "Philip Østli"
+        "name": "Philip Østli",
+        "name": "Stefan Witkamp"
       }
     ]
   },
@@ -51,4 +52,4 @@
   },
   "homepage": "https://www.zaptec.com/",
   "homeyCommunityTopicId": 118631
-}
\ No newline at end of file
+}
diff --git a/.homeycompose/drivers/templates/defaults.json b/.homeycompose/drivers/templates/defaults.json
index e841139..c5ce8be 100644
--- a/.homeycompose/drivers/templates/defaults.json
+++ b/.homeycompose/drivers/templates/defaults.json
@@ -13,7 +13,6 @@
   ],
   "class": "evcharger",
   "energy": {
-    "cumulative": true,
     "evCharger": true,
     "meterPowerImportedCapability": "meter_power.signed_meter_value"
   },
@@ -60,4 +59,4 @@
       }
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/app.json b/app.json
index e3f82d1..15d9e71 100644
--- a/app.json
+++ b/app.json
@@ -2052,7 +2052,6 @@
       ],
       "class": "evcharger",
       "energy": {
-        "cumulative": true,
         "evCharger": true,
         "meterPowerImportedCapability": "meter_power.signed_meter_value"
       },
@@ -2317,7 +2316,6 @@
       ],
       "class": "evcharger",
       "energy": {
-        "cumulative": true,
         "evCharger": true,
         "meterPowerImportedCapability": "meter_power.signed_meter_value"
       },
@@ -2582,7 +2580,6 @@
       ],
       "class": "evcharger",
       "energy": {
-        "cumulative": true,
         "evCharger": true,
         "meterPowerImportedCapability": "meter_power.signed_meter_value"
       },
@@ -2860,7 +2857,6 @@
       ],
       "class": "evcharger",
       "energy": {
-        "cumulative": true,
         "evCharger": true,
         "meterPowerImportedCapability": "meter_power.signed_meter_value"
       },
@@ -3313,4 +3309,4 @@
       "icon": "/assets/current_limit.svg"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/drivers/go/device.ts b/drivers/go/device.ts
index 95623ed..269fcdb 100644
--- a/drivers/go/device.ts
+++ b/drivers/go/device.ts
@@ -80,7 +80,6 @@ export class GoCharger extends Homey.Device {
     const energyConfig = this.getEnergy();
       if (energyConfig?.cumulative !== true || energyConfig?.evCharger !== true || energyConfig?.meterPowerImportedCapability !== "meter_power.signed_meter_value") {
         this.setEnergy({
-          cumulative: true,
           evCharger: true,
           meterPowerImportedCapability: "meter_power.signed_meter_value"
         }).catch((e) => {
diff --git a/drivers/go2/device.ts b/drivers/go2/device.ts
index 091e4b1..fbdb552 100644
--- a/drivers/go2/device.ts
+++ b/drivers/go2/device.ts
@@ -78,7 +78,6 @@ export class Go2Charger extends Homey.Device {
     const energyConfig = this.getEnergy();
       if (energyConfig?.cumulative !== true || energyConfig?.evCharger !== true || energyConfig?.meterPowerImportedCapability !== "meter_power.signed_meter_value") {
         this.setEnergy({
-          cumulative: true,
           evCharger: true,
           meterPowerImportedCapability: "meter_power.signed_meter_value"
         }).catch((e) => {
diff --git a/drivers/home/device.ts b/drivers/home/device.ts
index ea4ac00..31a0825 100644
--- a/drivers/home/device.ts
+++ b/drivers/home/device.ts
@@ -80,7 +80,6 @@ export class HomeCharger extends Homey.Device {
     const energyConfig = this.getEnergy();
       if (energyConfig?.cumulative !== true || energyConfig?.evCharger !== true || energyConfig?.meterPowerImportedCapability !== "meter_power.signed_meter_value") {
         this.setEnergy({
-          cumulative: true,
           evCharger: true,
           meterPowerImportedCapability: "meter_power.signed_meter_value"
         }).catch((e) => {
diff --git a/drivers/pro/device.ts b/drivers/pro/device.ts
index 153baca..6090953 100644
--- a/drivers/pro/device.ts
+++ b/drivers/pro/device.ts
@@ -80,7 +80,6 @@ export class ProCharger extends Homey.Device {
     const energyConfig = this.getEnergy();
       if (energyConfig?.cumulative !== true || energyConfig?.evCharger !== true || energyConfig?.meterPowerImportedCapability !== "meter_power.signed_meter_value") {
         this.setEnergy({
-          cumulative: true,
           evCharger: true,
           meterPowerImportedCapability: "meter_power.signed_meter_value"
         }).catch((e) => {
diff --git a/widgets/control-charger/widget.compose.json b/widgets/control-charger/widget.compose.json
index 5847233..ab5b0d2 100644
--- a/widgets/control-charger/widget.compose.json
+++ b/widgets/control-charger/widget.compose.json
@@ -7,7 +7,11 @@
   "settings": [],
   "devices": {
     "type": "app",
-    "singular": true
+    "singular": true,
+    "filter": {
+      "class": "evcharger",
+      "capabilities": "cable_permanent_lock"
+    }
   },
   "api": {
     "getChargerState": {