diff --git a/.homeycompose/capabilities/samsung_dryer_current_job_state.json b/.homeycompose/capabilities/samsung_dryer_current_job_state.json
index e4d73ce..84c2ee5 100644
--- a/.homeycompose/capabilities/samsung_dryer_current_job_state.json
+++ b/.homeycompose/capabilities/samsung_dryer_current_job_state.json
@@ -8,6 +8,30 @@
   "uiComponent": "sensor",
   "icon": "/assets/capabilities/samsung_dryer_current_job_state.svg",
   "values": [
+    {
+      "id": "cooling",
+      "title": {
+        "en": "Cooling"
+      }
+    },
+    {
+      "id": "delayWash",
+      "title": {
+        "en": "Delayed start"
+      }
+    },
+    {
+      "id": "drying",
+      "title": {
+        "en": "Drying"
+      }
+    },
+    {
+      "id": "finished",
+      "title": {
+        "en": "Finished"
+      }
+    },
     {
       "id": "none",
       "title": {
@@ -15,33 +39,63 @@
       }
     },
     {
-      "id": "idle",
+      "id": "refreshing",
       "title": {
-        "en": "Idle"
+        "en": "Refreshing"
       }
     },
     {
-      "id": "dry",
+      "id": "weightSensing",
       "title": {
-        "en": "Drying"
+        "en": "Weight sensing"
       }
     },
     {
-      "id": "rinse",
+      "id": "wrinklePrevent",
       "title": {
-        "en": "Rinsing"
+        "en": "Wrinkle prevention"
       }
     },
     {
-      "id": "spin",
+      "id": "dehumidifying",
       "title": {
-        "en": "Spinning"
+        "en": "Dehumidifying"
       }
     },
     {
-      "id": "finished",
+      "id": "aiDrying",
       "title": {
-        "en": "Finished"
+        "en": "AI drying"
+      }
+    },
+    {
+      "id": "sanitizing",
+      "title": {
+        "en": "Sanitizing"
+      }
+    },
+    {
+      "id": "internalCare",
+      "title": {
+        "en": "Cleaning"
+      }
+    },
+    {
+      "id": "freezeProtection",
+      "title": {
+        "en": "Freeze protection"
+      }
+    },
+    {
+      "id": "continousDehumidifying",
+      "title": {
+        "en": "Continous Dehumidifying"
+      }
+    },
+    {
+      "id": "thawingFrozenInside",
+      "title": {
+        "en": "Thawing frozen inside"
       }
     }
   ]
diff --git a/drivers/dryer/device.js b/drivers/dryer/device.js
index 5db68cd..30629f0 100644
--- a/drivers/dryer/device.js
+++ b/drivers/dryer/device.js
@@ -17,7 +17,7 @@ module.exports = class SmartThingsDeviceDryer extends SmartThingsDevice {
     {
       homeyCapabilityId: 'samsung_dryer_progress_remaining_time',
       smartThingsComponentId: 'main',
-      smartThingsCapabilityId: 'samsungce.washerOperatingState',
+      smartThingsCapabilityId: 'samsungce.dryerOperatingState',
       smartThingsAttributeId: 'remainingTimeStr',
       async onReport({ value }) {
         return value;
@@ -27,7 +27,7 @@ module.exports = class SmartThingsDeviceDryer extends SmartThingsDevice {
       homeyCapabilityId: 'samsung_dryer_current_job_state',
       smartThingsComponentId: 'main',
       smartThingsCapabilityId: 'samsungce.dryerOperatingState',
-      smartThingsAttributeId: 'washerJobState',
+      smartThingsAttributeId: 'dryerJobState',
       async onReport({ value }) {
         if (value === 'finished') {
           this.homey.flow