@@ -7,17 +7,16 @@
 Executing this script will several modules and methods one by one,
 and finally execute a query to query all of them at once.
 """
-import asyncio
 import collections.abc
 import json
 import logging
 import re
 from collections import defaultdict, namedtuple
 from pprint import pprint
 
-import click
+import asyncclick as click
 
-from kasa import TPLinkSmartHomeProtocol
+from kasa import Credentials, Discover
 
 Call = namedtuple("Call", "module method")
 
@@ -35,6 +34,8 @@ def scrub(res):
         "longitude_i",
         "latitude",
         "longitude",
+        "device_owner_hash",
+        "device_id_hash",
     ]
 
     for k, v in res.items():
@@ -63,8 +64,22 @@ def default_to_regular(d):
 
 @click.command()
 @click.argument("host")
+@click.option(
+    "--username",
+    default=None,
+    required=False,
+    envvar="TPLINK_CLOUD_USERNAME",
+    help="Username/email address to authenticate to device.",
+)
+@click.option(
+    "--password",
+    default=None,
+    required=False,
+    envvar="TPLINK_CLOUD_PASSWORD",
+    help="Password to use to authenticate to device.",
+)
 @click.option("-d", "--debug", is_flag=True)
-def cli(host, debug):
+async def cli(host, debug, username, password):
     """Generate devinfo file for given device."""
     if debug:
         logging.basicConfig(level=logging.DEBUG)
@@ -83,15 +98,15 @@ def cli(host, debug):
 
     successes = []
 
-    for test_call in items:
-
-        async def _run_query(test_call):
-            protocol = TPLinkSmartHomeProtocol(host)
-            return await protocol.query({test_call.module: {test_call.method: None}})
+    credentials = Credentials(username=username, password=password)
+    device = await Discover.discover_single(host, credentials=credentials)
 
+    for test_call in items:
         try:
             click.echo(f"Testing {test_call}..", nl=False)
-            info = asyncio.run(_run_query(test_call))
+            info = await device.protocol.query(
+                {test_call.module: {test_call.method: None}}
+            )
             resp = info[test_call.module]
         except Exception as ex:
             click.echo(click.style(f"FAIL {ex}", fg="red"))
@@ -111,19 +126,18 @@ async def _run_query(test_call):
 
     final = default_to_regular(final)
 
-    async def _run_final_query():
-        protocol = TPLinkSmartHomeProtocol(host)
-        return await protocol.query(final_query)
-
     try:
-        final = asyncio.run(_run_final_query())
+        final = await device.protocol.query(final_query)
     except Exception as ex:
         click.echo(
             click.style(
                 f"Unable to query all successes at once: {ex}", bold=True, fg="red"
             )
         )
 
+    if device.discovery_info:
+        final["discovery_result"] = device.discovery_info
+
     click.echo("Got %s successes" % len(successes))
     click.echo(click.style("## device info file ##", bold=True))
 
 
@@ -423,7 +423,7 @@ class EncryptionScheme(BaseModel):
     mac: str
     mgt_encrypt_schm: EncryptionScheme
 
-    device_id: Optional[str] = Field(default=None, alias="device_type_hash")
+    device_id: Optional[str] = Field(default=None, alias="device_id_hash")
     owner: Optional[str] = Field(default=None, alias="device_owner_hash")
     hw_ver: Optional[str] = None
     is_support_iot_cloud: Optional[bool] = None
 
@@ -211,6 +211,7 @@ def __init__(
         #       checks in accessors. the @updated_required decorator does not ensure
         #       mypy that these are not accessed incorrectly.
         self._last_update: Any = None
+        self.discovery_info: Optional[Dict[str, Any]] = None
 
         self._sys_info: Any = None  # TODO: this is here to avoid changing tests
         self._features: Set[str] = set()
@@ -371,6 +372,7 @@ def update_from_discover_info(self, info: Dict[str, Any]) -> None:
             # This allows setting of some info properties directly
             # from partial discovery info that will then be found
             # by the requires_update decorator
+            self.discovery_info = info
             self._set_sys_info(info)
 
     def _set_sys_info(self, sys_info: Dict[str, Any]) -> None:
 
@@ -0,0 +1,28 @@
+{
+    "system": {
+        "get_sysinfo": {
+            "active_mode": "schedule",
+            "alias": "Living Room Lamp",
+            "dev_name": "Wi-Fi Smart Plug",
+            "deviceId": "0000000000000000000000000000000000000000",
+            "err_code": 0,
+            "feature": "TIM",
+            "fwId": "00000000000000000000000000000000",
+            "hwId": "00000000000000000000000000000000",
+            "hw_ver": "1.0",
+            "icon_hash": "",
+            "latitude": 0,
+            "led_off": 0,
+            "longitude": 0,
+            "mac": "00:00:00:00:00:00",
+            "model": "HS100(UK)",
+            "oemId": "00000000000000000000000000000000",
+            "on_time": 4102,
+            "relay_state": 1,
+            "rssi": -58,
+            "sw_ver": "1.2.6 Build 200727 Rel.120236",
+            "type": "IOT.SMARTPLUGSWITCH",
+            "updating": 0
+        }
+    }
+}
@@ -1,43 +1,46 @@
 {
-    "emeter": {
-        "err_code": -1,
-        "err_msg": "module not support"
-    },
-    "smartlife.iot.common.emeter": {
-        "err_code": -1,
-        "err_msg": "module not support"
-    },
-    "smartlife.iot.dimmer": {
-        "err_code": -1,
-        "err_msg": "module not support"
-    },
-    "smartlife.iot.smartbulb.lightingservice": {
-        "err_code": -1,
-        "err_msg": "module not support"
+    "discovery_result": {
+        "alias": "192.168.1.84",
+        "device_id_hash": "00000000000000000000000000000000",
+        "device_owner_hash": "00000000000000000000000000000000",
+        "device_type_text": "IOT.SMARTPLUGSWITCH",
+        "factory_default": true,
+        "hw_ver": "4.1",
+        "mac": "00-00-00-00-00-00",
+        "mgt_encrypt_schm": {
+            "encrypt_type": "KLAP",
+            "http_port": 80,
+            "is_support_https": false
+        },
+        "model": "HS100(UK)"
     },
     "system": {
         "get_sysinfo": {
-            "active_mode": "schedule",
-            "alias": "Unused 3",
+            "active_mode": "none",
+            "alias": "Bedroom Lamp 2",
             "dev_name": "Smart Wi-Fi Plug",
             "deviceId": "0000000000000000000000000000000000000000",
             "err_code": 0,
             "feature": "TIM",
-            "fwId": "00000000000000000000000000000000",
             "hwId": "00000000000000000000000000000000",
             "hw_ver": "4.1",
             "icon_hash": "",
-            "latitude": 0,
+            "latitude_i": 0,
             "led_off": 0,
-            "longitude": 0,
+            "longitude_i": 0,
             "mac": "00:00:00:00:00:00",
+            "mic_type": "IOT.SMARTPLUGSWITCH",
             "model": "HS100(UK)",
+            "next_action": {
+                "type": -1
+            },
+            "ntc_state": 0,
             "oemId": "00000000000000000000000000000000",
-            "on_time": 0,
-            "relay_state": 0,
+            "on_time": 3115,
+            "relay_state": 1,
             "rssi": -63,
+            "status": "new",
             "sw_ver": "1.1.0 Build 201016 Rel.175121",
-            "type": "IOT.SMARTPLUGSWITCH",
             "updating": 0
         }
     }
 
@@ -294,9 +294,10 @@ def __init__(self, info):
 
         for target in info:
             # print("target %s" % target)
-            for cmd in info[target]:
-                # print("initializing tgt %s cmd %s" % (target, cmd))
-                proto[target][cmd] = info[target][cmd]
+            if target != "discovery_result":
+                for cmd in info[target]:
+                    # print("initializing tgt %s cmd %s" % (target, cmd))
+                    proto[target][cmd] = info[target][cmd]
         # if we have emeter support, we need to add the missing pieces
         for module in ["emeter", "smartlife.iot.common.emeter"]:
             if (