diff --git a/.gitignore b/.gitignore
index 14a7fc393..d549e8952 100644
--- a/.gitignore
+++ b/.gitignore
@@ -306,3 +306,4 @@ paket-files/
 # Except for the release folders which contains vsts release code
 !azure-devops/azext_devops/devops_sdk/*/release/
 azure-devops/azext_devops/devops_sdk/*/release/release/__pycache__
+.azure/devcliextensions
\ No newline at end of file
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 8440db113..895f047a2 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -5,7 +5,7 @@
             "name": "Azure DevOps CLI Debug (Integrated Console)",
             "type": "python",
             "request": "launch",
-            "pythonPath": "${config:python.pythonPath}",
+            "python": "${command:python.interpreterPath}",
             "program": "${workspaceRoot}/scripts/run_az.py",
             "cwd": "${workspaceRoot}/azure-devops/",
             "args": [
@@ -25,7 +25,7 @@
                 "WaitOnNormalExit",
                 "RedirectOutput"
             ],
-            "debugStdLib": true,
+            "justMyCode": false,
             "preLaunchTask": "BuildWheel",
             "env": {
                 "AZURE_EXTENSION_DIR": "${workspaceRoot}"
diff --git a/azure-devops/azext_devops/dev/team/invoke.py b/azure-devops/azext_devops/dev/team/invoke.py
index 983bc23c4..07954cce2 100644
--- a/azure-devops/azext_devops/dev/team/invoke.py
+++ b/azure-devops/azext_devops/dev/team/invoke.py
@@ -114,7 +114,9 @@ def invoke(area=None, resource=None,
         logger.info('Content type header is None.')
         is_content_available = False
     elif 'json' in response.headers.get("content-type") and not out_file:
-        return response.json()
+        response_dict = response.json()
+        response_dict["continuation_token"] = response.headers.get('X-MS-ContinuationToken')
+        return response_dict
 
     # Only handle out file scenario if the content is available (content-type is not None)
     if is_content_available: