diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index b7301476970..a1c335d2262 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -337,3 +337,5 @@
 /src/storage-discovery/ @shanefujs @calvinhzy
 
 /src/aks-agent/ @feiskyer @mainred @nilo19
+
+/src/migrate/ @saifaldin14
diff --git a/src/migrate/HISTORY.rst b/src/migrate/HISTORY.rst
index d730d379ded..4caf538a567 100644
--- a/src/migrate/HISTORY.rst
+++ b/src/migrate/HISTORY.rst
@@ -7,4 +7,7 @@ Release History
 +++++++++++++++
 * Initial release.
 
+2.0.0
++++++++++++++++
+* New version.
 
diff --git a/src/migrate/azext_migrate/__init__.py b/src/migrate/azext_migrate/__init__.py
index 943d3ddc823..d3c97683f01 100644
--- a/src/migrate/azext_migrate/__init__.py
+++ b/src/migrate/azext_migrate/__init__.py
@@ -4,7 +4,6 @@
 # --------------------------------------------------------------------------------------------
 
 from azure.cli.core import AzCommandsLoader
-from azure.cli.core.profiles import ResourceType
 
 
 class MigrateCommandsLoader(AzCommandsLoader):
@@ -18,13 +17,23 @@ def __init__(self, cli_ctx=None):
 
         super().__init__(
             cli_ctx=cli_ctx,
-            custom_command_type=migrate_custom,
-            resource_type=ResourceType.MGMT_MIGRATE
+            custom_command_type=migrate_custom
         )
 
     def load_command_table(self, args):
         from azext_migrate.commands \
             import load_command_table
+        from azure.cli.core.aaz import load_aaz_command_table
+        try:
+            from . import aaz
+        except ImportError:
+            aaz = None
+        if aaz:
+            load_aaz_command_table(
+                loader=self,
+                aaz_pkg_name=aaz.__name__,
+                args=args
+            )
         load_command_table(self, args)
         return self.command_table
 
diff --git a/src/migrate/azext_migrate/aaz/__init__.py b/src/migrate/azext_migrate/aaz/__init__.py
new file mode 100644
index 00000000000..5757aea3175
--- /dev/null
+++ b/src/migrate/azext_migrate/aaz/__init__.py
@@ -0,0 +1,6 @@
+# --------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+#
+# Code generated by aaz-dev-tools
+# --------------------------------------------------------------------------------------------
diff --git a/src/migrate/setup.cfg b/src/migrate/setup.cfg
index 3c6e79cf31d..2fdd96e5d39 100644
--- a/src/migrate/setup.cfg
+++ b/src/migrate/setup.cfg
@@ -1,2 +1 @@
-[bdist_wheel]
-universal=1
+#setup.cfg
\ No newline at end of file
diff --git a/src/migrate/setup.py b/src/migrate/setup.py
index d434d30b0d6..b52c3543cf1 100644
--- a/src/migrate/setup.py
+++ b/src/migrate/setup.py
@@ -5,10 +5,9 @@
 # Licensed under the MIT License. See License.txt in the project root for license information.
 # --------------------------------------------------------------------------------------------
 
-from codecs import open
 from setuptools import setup, find_packages
 
-VERSION = "1.0.0"
+VERSION = "2.0.0"
 
 CLASSIFIERS = [
     'Development Status :: 4 - Beta',
@@ -32,8 +31,8 @@
     description='Support for Azure Migrate preview',
     long_description='Support for Azure Migrate preview',
     license='MIT',
-    author='Jeffrey Li',
-    author_email='jefl@microsoft.com',
+    author='Saif Al-Din Ali',
+    author_email='saifaldinali@microsoft.com',
     url='https://github.com/Azure/azure-cli-extensions/tree/main/src/migrate',
     classifiers=CLASSIFIERS,
     packages=find_packages(exclude=["tests"]),
diff --git a/src/service_name.json b/src/service_name.json
index 414aae014d4..24283c09b6f 100644
--- a/src/service_name.json
+++ b/src/service_name.json
@@ -973,5 +973,10 @@
     "Command": "az site",
     "AzureServiceName": "Azure Arc site manager",
     "URL": "https://learn.microsoft.com/en-us/azure/azure-arc/site-manager/"
+  },
+  {
+    "Command": "az migrate",
+    "AzureServiceName": "Azure Migrate",
+    "URL": "https://learn.microsoft.com/azure/migrate"
   }
 ]