diff --git a/lib/dreame.js b/lib/dreame.js
index 8f2b56db..5a25ab2c 100644
--- a/lib/dreame.js
+++ b/lib/dreame.js
@@ -117,6 +117,10 @@ const DreameState = {
     SWEEPING_AND_MOPPING: 12,
     CHARGING_COMPLETED: 13,
     UPGRADING: 14,
+    WATER_INSPECTING: 19,
+    WASHING_MOP_PAUSE: 21,
+    DUST_COLLECTION: 22,
+    REMOTE_CLEAN: 23
 };
 
 const DreameWashBaseState = {
@@ -138,15 +142,23 @@ const DreameProperties = {
         control_mapping: {
             0: DreameState.UNKNOWN,
             3: DreameState.IDLE,
-            5: [DreameState.SWEEPING_AND_MOPPING, DreameState.SWEEPING],
+            5: DreameState.SWEEPING,
             6: DreameState.RETURNING,
-            8: [DreameState.CHARGING, DreameState.CHARGING_COMPLETED],
+            8: DreameState.CHARGING,
             10: DreameState.PAUSED,
             12: DreameState.ERROR,
             14: DreameState.UPGRADING,
+            22: DreameState.DUST_COLLECTION,
             26: DreameState.RETURNING_WASHING,
+            27: DreameState.WASHING_MOP_PAUSE,
             28: DreameState.DRYING,
             29: DreameState.WASHING,
+            30: DreameState.MOPPING,
+            31: DreameState.SWEEPING_AND_MOPPING,
+            32: DreameState.REMOTE_CLEAN,
+            33: DreameState.WATER_INSPECTING,
+            34: DreameState.CHARGING_COMPLETED,
+            35: DreameState.BUILDING,
         },
         type: 'int',
     },
diff --git a/lib/objects.js b/lib/objects.js
index 03799929..6c0f9bd6 100644
--- a/lib/objects.js
+++ b/lib/objects.js
@@ -1163,7 +1163,7 @@ module.exports = {
                 role: 'value.state',
                 read: true,
                 write: false,
-                max: 30,
+                max: 40,
                 states: {
                     0: 'Unknown',
                     1: 'Initiating',
@@ -1194,7 +1194,13 @@ module.exports = {
                     26: 'Going to Mop cleaning',
                     27: 'Cleaning Mop paused',
                     28: 'Drying Mop',
-                    29: 'Washing',
+                    29: 'Washing Mop',
+                    30: 'Mopping',
+                    31: 'Cleaning and Mopping',
+                    32: 'Remote clean',
+                    33: 'Water inspecting',
+                    34: 'Charging complete',
+                    35: 'Building',
                 },
             },
             native: {},