diff --git a/devtools/dump_devinfo.py b/devtools/dump_devinfo.py
index 18005990..b6c44fe5 100644
--- a/devtools/dump_devinfo.py
+++ b/devtools/dump_devinfo.py
@@ -157,6 +157,8 @@ def scrub(res):
                     v = "#MASKED_NAME#"
                 elif isinstance(res[k], int):
                     v = 0
+                elif k in ["map_data"]:  #
+                    v = "#SCRUBBED_MAPDATA#"
                 elif k in ["device_id", "dev_id"] and "SCRUBBED" in v:
                     pass  # already scrubbed
                 elif k == ["device_id", "dev_id"] and len(v) > 40:
diff --git a/devtools/helpers/smartrequests.py b/devtools/helpers/smartrequests.py
index 18ae00e2..20b1300e 100644
--- a/devtools/helpers/smartrequests.py
+++ b/devtools/helpers/smartrequests.py
@@ -425,4 +425,28 @@ COMPONENT_REQUESTS = {
     "dimmer_calibration": [],
     "fan_control": [],
     "overheat_protection": [],
+    # Vacuum components
+    "clean": [
+        SmartRequest.get_raw_request("get_clean_records"),
+        SmartRequest.get_raw_request("get_vac_state"),
+    ],
+    "battery": [SmartRequest.get_raw_request("get_battery_info")],
+    "consumables": [SmartRequest.get_raw_request("get_consumables_info")],
+    "direction_control": [],
+    "button_and_led": [],
+    "speaker": [
+        SmartRequest.get_raw_request("get_support_voice_language"),
+        SmartRequest.get_raw_request("get_current_voice_language"),
+    ],
+    "map": [
+        SmartRequest.get_raw_request("get_map_info"),
+        SmartRequest.get_raw_request("get_map_data"),
+    ],
+    "auto_change_map": [SmartRequest.get_raw_request("get_auto_change_map")],
+    "dust_bucket": [SmartRequest.get_raw_request("get_auto_dust_collection")],
+    "mop": [SmartRequest.get_raw_request("get_mop_state")],
+    "do_not_disturb": [SmartRequest.get_raw_request("get_do_not_disturb")],
+    "charge_pose_clean": [],
+    "continue_breakpoint_sweep": [],
+    "goto_point": [],
 }