diff --git a/azure-graphrbac/azure/graphrbac/models/key_credential.py b/azure-graphrbac/azure/graphrbac/models/key_credential.py
index 275d871796fc..70f83b80b1f6 100644
--- a/azure-graphrbac/azure/graphrbac/models/key_credential.py
+++ b/azure-graphrbac/azure/graphrbac/models/key_credential.py
@@ -31,6 +31,8 @@ class KeyCredential(Model):
     :param type: Type. Acceptable values are 'AsymmetricX509Cert' and
      'Symmetric'.
     :type type: str
+    :param custom_key_identifier: Custom Key Identifier
+    :type custom_key_identifier: bytearray
     """
 
     _attribute_map = {
@@ -41,9 +43,10 @@ class KeyCredential(Model):
         'key_id': {'key': 'keyId', 'type': 'str'},
         'usage': {'key': 'usage', 'type': 'str'},
         'type': {'key': 'type', 'type': 'str'},
+        'custom_key_identifier': {'key': 'customKeyIdentifier', 'type': 'bytearray'},
     }
 
-    def __init__(self, additional_properties=None, start_date=None, end_date=None, value=None, key_id=None, usage=None, type=None):
+    def __init__(self, additional_properties=None, start_date=None, end_date=None, value=None, key_id=None, usage=None, type=None, custom_key_identifier=None):
         super(KeyCredential, self).__init__()
         self.additional_properties = additional_properties
         self.start_date = start_date
@@ -52,3 +55,4 @@ def __init__(self, additional_properties=None, start_date=None, end_date=None, v
         self.key_id = key_id
         self.usage = usage
         self.type = type
+        self.custom_key_identifier = custom_key_identifier
diff --git a/azure-graphrbac/azure/graphrbac/operations/applications_operations.py b/azure-graphrbac/azure/graphrbac/operations/applications_operations.py
index a489a1550d7c..3b33d2dae46e 100644
--- a/azure-graphrbac/azure/graphrbac/operations/applications_operations.py
+++ b/azure-graphrbac/azure/graphrbac/operations/applications_operations.py
@@ -21,7 +21,7 @@ class ApplicationsOperations(object):
     :param client: Client for service requests.
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
-    :param deserializer: An objec model deserializer.
+    :param deserializer: An object model deserializer.
     :ivar api_version: Client API version. Constant value: "1.6".
     """
 
@@ -54,7 +54,7 @@ def create(
          :class:`GraphErrorException<azure.graphrbac.models.GraphErrorException>`
         """
         # Construct URL
-        url = '/{tenantID}/applications'
+        url = self.create.metadata['url']
         path_format_arguments = {
             'tenantID': self._serialize.url("self.config.tenant_id", self.config.tenant_id, 'str')
         }
@@ -95,6 +95,7 @@ def create(
             return client_raw_response
 
         return deserialized
+    create.metadata = {'url': '/{tenantID}/applications'}
 
     def list(
             self, filter=None, custom_headers=None, raw=False, **operation_config):
@@ -117,7 +118,7 @@ def internal_paging(next_link=None, raw=False):
 
             if not next_link:
                 # Construct URL
-                url = '/{tenantID}/applications'
+                url = self.list.metadata['url']
                 path_format_arguments = {
                     'tenantID': self._serialize.url("self.config.tenant_id", self.config.tenant_id, 'str')
                 }
@@ -168,6 +169,7 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
+    list.metadata = {'url': '/{tenantID}/applications'}
 
     def delete(
             self, application_object_id, custom_headers=None, raw=False, **operation_config):
@@ -186,7 +188,7 @@ def delete(
          :class:`GraphErrorException<azure.graphrbac.models.GraphErrorException>`
         """
         # Construct URL
-        url = '/{tenantID}/applications/{applicationObjectId}'
+        url = self.delete.metadata['url']
         path_format_arguments = {
             'applicationObjectId': self._serialize.url("application_object_id", application_object_id, 'str'),
             'tenantID': self._serialize.url("self.config.tenant_id", self.config.tenant_id, 'str')
@@ -217,6 +219,7 @@ def delete(
         if raw:
             client_raw_response = ClientRawResponse(None, response)
             return client_raw_response
+    delete.metadata = {'url': '/{tenantID}/applications/{applicationObjectId}'}
 
     def get(
             self, application_object_id, custom_headers=None, raw=False, **operation_config):
@@ -236,7 +239,7 @@ def get(
          :class:`GraphErrorException<azure.graphrbac.models.GraphErrorException>`
         """
         # Construct URL
-        url = '/{tenantID}/applications/{applicationObjectId}'
+        url = self.get.metadata['url']
         path_format_arguments = {
             'applicationObjectId': self._serialize.url("application_object_id", application_object_id, 'str'),
             'tenantID': self._serialize.url("self.config.tenant_id", self.config.tenant_id, 'str')
@@ -274,6 +277,7 @@ def get(
             return client_raw_response
 
         return deserialized
+    get.metadata = {'url': '/{tenantID}/applications/{applicationObjectId}'}
 
     def patch(
             self, application_object_id, parameters, custom_headers=None, raw=False, **operation_config):
@@ -294,7 +298,7 @@ def patch(
          :class:`GraphErrorException<azure.graphrbac.models.GraphErrorException>`
         """
         # Construct URL
-        url = '/{tenantID}/applications/{applicationObjectId}'
+        url = self.patch.metadata['url']
         path_format_arguments = {
             'applicationObjectId': self._serialize.url("application_object_id", application_object_id, 'str'),
             'tenantID': self._serialize.url("self.config.tenant_id", self.config.tenant_id, 'str')
@@ -329,6 +333,7 @@ def patch(
         if raw:
             client_raw_response = ClientRawResponse(None, response)
             return client_raw_response
+    patch.metadata = {'url': '/{tenantID}/applications/{applicationObjectId}'}
 
     def list_owners(
             self, application_object_id, custom_headers=None, raw=False, **operation_config):
@@ -355,7 +360,7 @@ def internal_paging(next_link=None, raw=False):
 
             if not next_link:
                 # Construct URL
-                url = '/{tenantID}/applications/{applicationObjectId}/owners'
+                url = self.list_owners.metadata['url']
                 path_format_arguments = {
                     'applicationObjectId': self._serialize.url("application_object_id", application_object_id, 'str'),
                     'tenantID': self._serialize.url("self.config.tenant_id", self.config.tenant_id, 'str')
@@ -399,6 +404,7 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
+    list_owners.metadata = {'url': '/{tenantID}/applications/{applicationObjectId}/owners'}
 
     def add_owner(
             self, application_object_id, url, additional_properties=None, custom_headers=None, raw=False, **operation_config):
@@ -429,7 +435,7 @@ def add_owner(
         parameters = models.ApplicationAddOwnerParameters(additional_properties=additional_properties, url=url)
 
         # Construct URL
-        url = '/{tenantID}/applications/{applicationObjectId}/$links/owners'
+        url = self.add_owner.metadata['url']
         path_format_arguments = {
             'applicationObjectId': self._serialize.url("application_object_id", application_object_id, 'str'),
             'tenantID': self._serialize.url("self.config.tenant_id", self.config.tenant_id, 'str')
@@ -464,6 +470,7 @@ def add_owner(
         if raw:
             client_raw_response = ClientRawResponse(None, response)
             return client_raw_response
+    add_owner.metadata = {'url': '/{tenantID}/applications/{applicationObjectId}/$links/owners'}
 
     def list_key_credentials(
             self, application_object_id, custom_headers=None, raw=False, **operation_config):
@@ -486,7 +493,7 @@ def internal_paging(next_link=None, raw=False):
 
             if not next_link:
                 # Construct URL
-                url = '/{tenantID}/applications/{applicationObjectId}/keyCredentials'
+                url = self.list_key_credentials.metadata['url']
                 path_format_arguments = {
                     'applicationObjectId': self._serialize.url("application_object_id", application_object_id, 'str'),
                     'tenantID': self._serialize.url("self.config.tenant_id", self.config.tenant_id, 'str')
@@ -530,6 +537,7 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
+    list_key_credentials.metadata = {'url': '/{tenantID}/applications/{applicationObjectId}/keyCredentials'}
 
     def update_key_credentials(
             self, application_object_id, value, custom_headers=None, raw=False, **operation_config):
@@ -552,7 +560,7 @@ def update_key_credentials(
         parameters = models.KeyCredentialsUpdateParameters(value=value)
 
         # Construct URL
-        url = '/{tenantID}/applications/{applicationObjectId}/keyCredentials'
+        url = self.update_key_credentials.metadata['url']
         path_format_arguments = {
             'applicationObjectId': self._serialize.url("application_object_id", application_object_id, 'str'),
             'tenantID': self._serialize.url("self.config.tenant_id", self.config.tenant_id, 'str')
@@ -587,6 +595,7 @@ def update_key_credentials(
         if raw:
             client_raw_response = ClientRawResponse(None, response)
             return client_raw_response
+    update_key_credentials.metadata = {'url': '/{tenantID}/applications/{applicationObjectId}/keyCredentials'}
 
     def list_password_credentials(
             self, application_object_id, custom_headers=None, raw=False, **operation_config):
@@ -609,7 +618,7 @@ def internal_paging(next_link=None, raw=False):
 
             if not next_link:
                 # Construct URL
-                url = '/{tenantID}/applications/{applicationObjectId}/passwordCredentials'
+                url = self.list_password_credentials.metadata['url']
                 path_format_arguments = {
                     'applicationObjectId': self._serialize.url("application_object_id", application_object_id, 'str'),
                     'tenantID': self._serialize.url("self.config.tenant_id", self.config.tenant_id, 'str')
@@ -653,6 +662,7 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
+    list_password_credentials.metadata = {'url': '/{tenantID}/applications/{applicationObjectId}/passwordCredentials'}
 
     def update_password_credentials(
             self, application_object_id, value, custom_headers=None, raw=False, **operation_config):
@@ -675,7 +685,7 @@ def update_password_credentials(
         parameters = models.PasswordCredentialsUpdateParameters(value=value)
 
         # Construct URL
-        url = '/{tenantID}/applications/{applicationObjectId}/passwordCredentials'
+        url = self.update_password_credentials.metadata['url']
         path_format_arguments = {
             'applicationObjectId': self._serialize.url("application_object_id", application_object_id, 'str'),
             'tenantID': self._serialize.url("self.config.tenant_id", self.config.tenant_id, 'str')
@@ -710,3 +720,4 @@ def update_password_credentials(
         if raw:
             client_raw_response = ClientRawResponse(None, response)
             return client_raw_response
+    update_password_credentials.metadata = {'url': '/{tenantID}/applications/{applicationObjectId}/passwordCredentials'}
diff --git a/azure-graphrbac/azure/graphrbac/operations/domains_operations.py b/azure-graphrbac/azure/graphrbac/operations/domains_operations.py
index c54bc81edbba..fefc35164abc 100644
--- a/azure-graphrbac/azure/graphrbac/operations/domains_operations.py
+++ b/azure-graphrbac/azure/graphrbac/operations/domains_operations.py
@@ -22,7 +22,7 @@ class DomainsOperations(object):
     :param client: Client for service requests.
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
-    :param deserializer: An objec model deserializer.
+    :param deserializer: An object model deserializer.
     :ivar api_version: Client API version. Constant value: "1.6".
     """
 
@@ -57,7 +57,7 @@ def internal_paging(next_link=None, raw=False):
 
             if not next_link:
                 # Construct URL
-                url = '/{tenantID}/domains'
+                url = self.list.metadata['url']
                 path_format_arguments = {
                     'tenantID': self._serialize.url("self.config.tenant_id", self.config.tenant_id, 'str')
                 }
@@ -104,6 +104,7 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
+    list.metadata = {'url': '/{tenantID}/domains'}
 
     def get(
             self, domain_name, custom_headers=None, raw=False, **operation_config):
@@ -122,7 +123,7 @@ def get(
         :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
         """
         # Construct URL
-        url = '/{tenantID}/domains/{domainName}'
+        url = self.get.metadata['url']
         path_format_arguments = {
             'domainName': self._serialize.url("domain_name", domain_name, 'str'),
             'tenantID': self._serialize.url("self.config.tenant_id", self.config.tenant_id, 'str')
@@ -162,3 +163,4 @@ def get(
             return client_raw_response
 
         return deserialized
+    get.metadata = {'url': '/{tenantID}/domains/{domainName}'}
diff --git a/azure-graphrbac/azure/graphrbac/operations/groups_operations.py b/azure-graphrbac/azure/graphrbac/operations/groups_operations.py
index 3b58ef252076..a017004325d8 100644
--- a/azure-graphrbac/azure/graphrbac/operations/groups_operations.py
+++ b/azure-graphrbac/azure/graphrbac/operations/groups_operations.py
@@ -21,7 +21,7 @@ class GroupsOperations(object):
     :param client: Client for service requests.
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
-    :param deserializer: An objec model deserializer.
+    :param deserializer: An object model deserializer.
     :ivar api_version: Client API version. Constant value: "1.6".
     """
 
@@ -56,7 +56,7 @@ def is_member_of(
          :class:`GraphErrorException<azure.graphrbac.models.GraphErrorException>`
         """
         # Construct URL
-        url = '/{tenantID}/isMemberOf'
+        url = self.is_member_of.metadata['url']
         path_format_arguments = {
             'tenantID': self._serialize.url("self.config.tenant_id", self.config.tenant_id, 'str')
         }
@@ -97,6 +97,7 @@ def is_member_of(
             return client_raw_response
 
         return deserialized
+    is_member_of.metadata = {'url': '/{tenantID}/isMemberOf'}
 
     def remove_member(
             self, group_object_id, member_object_id, custom_headers=None, raw=False, **operation_config):
@@ -118,7 +119,7 @@ def remove_member(
          :class:`GraphErrorException<azure.graphrbac.models.GraphErrorException>`
         """
         # Construct URL
-        url = '/{tenantID}/groups/{groupObjectId}/$links/members/{memberObjectId}'
+        url = self.remove_member.metadata['url']
         path_format_arguments = {
             'groupObjectId': self._serialize.url("group_object_id", group_object_id, 'str'),
             'memberObjectId': self._serialize.url("member_object_id", member_object_id, 'str'),
@@ -150,6 +151,7 @@ def remove_member(
         if raw:
             client_raw_response = ClientRawResponse(None, response)
             return client_raw_response
+    remove_member.metadata = {'url': '/{tenantID}/groups/{groupObjectId}/$links/members/{memberObjectId}'}
 
     def add_member(
             self, group_object_id, url, additional_properties=None, custom_headers=None, raw=False, **operation_config):
@@ -180,7 +182,7 @@ def add_member(
         parameters = models.GroupAddMemberParameters(additional_properties=additional_properties, url=url)
 
         # Construct URL
-        url = '/{tenantID}/groups/{groupObjectId}/$links/members'
+        url = self.add_member.metadata['url']
         path_format_arguments = {
             'groupObjectId': self._serialize.url("group_object_id", group_object_id, 'str'),
             'tenantID': self._serialize.url("self.config.tenant_id", self.config.tenant_id, 'str')
@@ -215,6 +217,7 @@ def add_member(
         if raw:
             client_raw_response = ClientRawResponse(None, response)
             return client_raw_response
+    add_member.metadata = {'url': '/{tenantID}/groups/{groupObjectId}/$links/members'}
 
     def create(
             self, parameters, custom_headers=None, raw=False, **operation_config):
@@ -234,7 +237,7 @@ def create(
          :class:`GraphErrorException<azure.graphrbac.models.GraphErrorException>`
         """
         # Construct URL
-        url = '/{tenantID}/groups'
+        url = self.create.metadata['url']
         path_format_arguments = {
             'tenantID': self._serialize.url("self.config.tenant_id", self.config.tenant_id, 'str')
         }
@@ -275,6 +278,7 @@ def create(
             return client_raw_response
 
         return deserialized
+    create.metadata = {'url': '/{tenantID}/groups'}
 
     def list(
             self, filter=None, custom_headers=None, raw=False, **operation_config):
@@ -297,7 +301,7 @@ def internal_paging(next_link=None, raw=False):
 
             if not next_link:
                 # Construct URL
-                url = '/{tenantID}/groups'
+                url = self.list.metadata['url']
                 path_format_arguments = {
                     'tenantID': self._serialize.url("self.config.tenant_id", self.config.tenant_id, 'str')
                 }
@@ -348,6 +352,7 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
+    list.metadata = {'url': '/{tenantID}/groups'}
 
     def get_group_members(
             self, object_id, custom_headers=None, raw=False, **operation_config):
@@ -371,7 +376,7 @@ def internal_paging(next_link=None, raw=False):
 
             if not next_link:
                 # Construct URL
-                url = '/{tenantID}/groups/{objectId}/members'
+                url = self.get_group_members.metadata['url']
                 path_format_arguments = {
                     'objectId': self._serialize.url("object_id", object_id, 'str'),
                     'tenantID': self._serialize.url("self.config.tenant_id", self.config.tenant_id, 'str')
@@ -421,6 +426,7 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
+    get_group_members.metadata = {'url': '/{tenantID}/groups/{objectId}/members'}
 
     def get(
             self, object_id, custom_headers=None, raw=False, **operation_config):
@@ -441,7 +447,7 @@ def get(
          :class:`GraphErrorException<azure.graphrbac.models.GraphErrorException>`
         """
         # Construct URL
-        url = '/{tenantID}/groups/{objectId}'
+        url = self.get.metadata['url']
         path_format_arguments = {
             'objectId': self._serialize.url("object_id", object_id, 'str'),
             'tenantID': self._serialize.url("self.config.tenant_id", self.config.tenant_id, 'str')
@@ -479,6 +485,7 @@ def get(
             return client_raw_response
 
         return deserialized
+    get.metadata = {'url': '/{tenantID}/groups/{objectId}'}
 
     def delete(
             self, object_id, custom_headers=None, raw=False, **operation_config):
@@ -497,7 +504,7 @@ def delete(
          :class:`GraphErrorException<azure.graphrbac.models.GraphErrorException>`
         """
         # Construct URL
-        url = '/{tenantID}/groups/{objectId}'
+        url = self.delete.metadata['url']
         path_format_arguments = {
             'objectId': self._serialize.url("object_id", object_id, 'str'),
             'tenantID': self._serialize.url("self.config.tenant_id", self.config.tenant_id, 'str')
@@ -528,6 +535,7 @@ def delete(
         if raw:
             client_raw_response = ClientRawResponse(None, response)
             return client_raw_response
+    delete.metadata = {'url': '/{tenantID}/groups/{objectId}'}
 
     def get_member_groups(
             self, object_id, security_enabled_only, additional_properties=None, custom_headers=None, raw=False, **operation_config):
@@ -560,7 +568,7 @@ def internal_paging(next_link=None, raw=False):
 
             if not next_link:
                 # Construct URL
-                url = '/{tenantID}/groups/{objectId}/getMemberGroups'
+                url = self.get_member_groups.metadata['url']
                 path_format_arguments = {
                     'objectId': self._serialize.url("object_id", object_id, 'str'),
                     'tenantID': self._serialize.url("self.config.tenant_id", self.config.tenant_id, 'str')
@@ -607,3 +615,4 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
+    get_member_groups.metadata = {'url': '/{tenantID}/groups/{objectId}/getMemberGroups'}
diff --git a/azure-graphrbac/azure/graphrbac/operations/objects_operations.py b/azure-graphrbac/azure/graphrbac/operations/objects_operations.py
index e48ff1cfd56a..570a1b4abc28 100644
--- a/azure-graphrbac/azure/graphrbac/operations/objects_operations.py
+++ b/azure-graphrbac/azure/graphrbac/operations/objects_operations.py
@@ -22,7 +22,7 @@ class ObjectsOperations(object):
     :param client: Client for service requests.
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
-    :param deserializer: An objec model deserializer.
+    :param deserializer: An object model deserializer.
     :ivar api_version: Client API version. Constant value: "1.6".
     """
 
@@ -53,7 +53,7 @@ def get_current_user(
          :class:`GraphErrorException<azure.graphrbac.models.GraphErrorException>`
         """
         # Construct URL
-        url = '/{tenantID}/me'
+        url = self.get_current_user.metadata['url']
         path_format_arguments = {
             'tenantID': self._serialize.url("self.config.tenant_id", self.config.tenant_id, 'str')
         }
@@ -90,6 +90,7 @@ def get_current_user(
             return client_raw_response
 
         return deserialized
+    get_current_user.metadata = {'url': '/{tenantID}/me'}
 
     def get_objects_by_object_ids(
             self, parameters, custom_headers=None, raw=False, **operation_config):
@@ -111,7 +112,7 @@ def internal_paging(next_link=None, raw=False):
 
             if not next_link:
                 # Construct URL
-                url = '/{tenantID}/getObjectsByObjectIds'
+                url = self.get_objects_by_object_ids.metadata['url']
                 path_format_arguments = {
                     'tenantID': self._serialize.url("self.config.tenant_id", self.config.tenant_id, 'str')
                 }
@@ -165,3 +166,4 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
+    get_objects_by_object_ids.metadata = {'url': '/{tenantID}/getObjectsByObjectIds'}
diff --git a/azure-graphrbac/azure/graphrbac/operations/service_principals_operations.py b/azure-graphrbac/azure/graphrbac/operations/service_principals_operations.py
index 64c13fbc8339..5fca4ca9882c 100644
--- a/azure-graphrbac/azure/graphrbac/operations/service_principals_operations.py
+++ b/azure-graphrbac/azure/graphrbac/operations/service_principals_operations.py
@@ -21,7 +21,7 @@ class ServicePrincipalsOperations(object):
     :param client: Client for service requests.
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
-    :param deserializer: An objec model deserializer.
+    :param deserializer: An object model deserializer.
     :ivar api_version: Client API version. Constant value: "1.6".
     """
 
@@ -55,7 +55,7 @@ def create(
          :class:`GraphErrorException<azure.graphrbac.models.GraphErrorException>`
         """
         # Construct URL
-        url = '/{tenantID}/servicePrincipals'
+        url = self.create.metadata['url']
         path_format_arguments = {
             'tenantID': self._serialize.url("self.config.tenant_id", self.config.tenant_id, 'str')
         }
@@ -96,6 +96,7 @@ def create(
             return client_raw_response
 
         return deserialized
+    create.metadata = {'url': '/{tenantID}/servicePrincipals'}
 
     def list(
             self, filter=None, custom_headers=None, raw=False, **operation_config):
@@ -118,7 +119,7 @@ def internal_paging(next_link=None, raw=False):
 
             if not next_link:
                 # Construct URL
-                url = '/{tenantID}/servicePrincipals'
+                url = self.list.metadata['url']
                 path_format_arguments = {
                     'tenantID': self._serialize.url("self.config.tenant_id", self.config.tenant_id, 'str')
                 }
@@ -169,6 +170,7 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
+    list.metadata = {'url': '/{tenantID}/servicePrincipals'}
 
     def delete(
             self, object_id, custom_headers=None, raw=False, **operation_config):
@@ -187,7 +189,7 @@ def delete(
          :class:`GraphErrorException<azure.graphrbac.models.GraphErrorException>`
         """
         # Construct URL
-        url = '/{tenantID}/servicePrincipals/{objectId}'
+        url = self.delete.metadata['url']
         path_format_arguments = {
             'objectId': self._serialize.url("object_id", object_id, 'str'),
             'tenantID': self._serialize.url("self.config.tenant_id", self.config.tenant_id, 'str')
@@ -218,6 +220,7 @@ def delete(
         if raw:
             client_raw_response = ClientRawResponse(None, response)
             return client_raw_response
+    delete.metadata = {'url': '/{tenantID}/servicePrincipals/{objectId}'}
 
     def get(
             self, object_id, custom_headers=None, raw=False, **operation_config):
@@ -237,7 +240,7 @@ def get(
          :class:`GraphErrorException<azure.graphrbac.models.GraphErrorException>`
         """
         # Construct URL
-        url = '/{tenantID}/servicePrincipals/{objectId}'
+        url = self.get.metadata['url']
         path_format_arguments = {
             'objectId': self._serialize.url("object_id", object_id, 'str'),
             'tenantID': self._serialize.url("self.config.tenant_id", self.config.tenant_id, 'str')
@@ -275,6 +278,7 @@ def get(
             return client_raw_response
 
         return deserialized
+    get.metadata = {'url': '/{tenantID}/servicePrincipals/{objectId}'}
 
     def list_owners(
             self, object_id, custom_headers=None, raw=False, **operation_config):
@@ -301,7 +305,7 @@ def internal_paging(next_link=None, raw=False):
 
             if not next_link:
                 # Construct URL
-                url = '/{tenantID}/servicePrincipals/{objectId}/owners'
+                url = self.list_owners.metadata['url']
                 path_format_arguments = {
                     'objectId': self._serialize.url("object_id", object_id, 'str'),
                     'tenantID': self._serialize.url("self.config.tenant_id", self.config.tenant_id, 'str')
@@ -345,6 +349,7 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
+    list_owners.metadata = {'url': '/{tenantID}/servicePrincipals/{objectId}/owners'}
 
     def list_key_credentials(
             self, object_id, custom_headers=None, raw=False, **operation_config):
@@ -368,7 +373,7 @@ def internal_paging(next_link=None, raw=False):
 
             if not next_link:
                 # Construct URL
-                url = '/{tenantID}/servicePrincipals/{objectId}/keyCredentials'
+                url = self.list_key_credentials.metadata['url']
                 path_format_arguments = {
                     'objectId': self._serialize.url("object_id", object_id, 'str'),
                     'tenantID': self._serialize.url("self.config.tenant_id", self.config.tenant_id, 'str')
@@ -412,6 +417,7 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
+    list_key_credentials.metadata = {'url': '/{tenantID}/servicePrincipals/{objectId}/keyCredentials'}
 
     def update_key_credentials(
             self, object_id, value, custom_headers=None, raw=False, **operation_config):
@@ -435,7 +441,7 @@ def update_key_credentials(
         parameters = models.KeyCredentialsUpdateParameters(value=value)
 
         # Construct URL
-        url = '/{tenantID}/servicePrincipals/{objectId}/keyCredentials'
+        url = self.update_key_credentials.metadata['url']
         path_format_arguments = {
             'objectId': self._serialize.url("object_id", object_id, 'str'),
             'tenantID': self._serialize.url("self.config.tenant_id", self.config.tenant_id, 'str')
@@ -470,6 +476,7 @@ def update_key_credentials(
         if raw:
             client_raw_response = ClientRawResponse(None, response)
             return client_raw_response
+    update_key_credentials.metadata = {'url': '/{tenantID}/servicePrincipals/{objectId}/keyCredentials'}
 
     def list_password_credentials(
             self, object_id, custom_headers=None, raw=False, **operation_config):
@@ -492,7 +499,7 @@ def internal_paging(next_link=None, raw=False):
 
             if not next_link:
                 # Construct URL
-                url = '/{tenantID}/servicePrincipals/{objectId}/passwordCredentials'
+                url = self.list_password_credentials.metadata['url']
                 path_format_arguments = {
                     'objectId': self._serialize.url("object_id", object_id, 'str'),
                     'tenantID': self._serialize.url("self.config.tenant_id", self.config.tenant_id, 'str')
@@ -536,6 +543,7 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
+    list_password_credentials.metadata = {'url': '/{tenantID}/servicePrincipals/{objectId}/passwordCredentials'}
 
     def update_password_credentials(
             self, object_id, value, custom_headers=None, raw=False, **operation_config):
@@ -558,7 +566,7 @@ def update_password_credentials(
         parameters = models.PasswordCredentialsUpdateParameters(value=value)
 
         # Construct URL
-        url = '/{tenantID}/servicePrincipals/{objectId}/passwordCredentials'
+        url = self.update_password_credentials.metadata['url']
         path_format_arguments = {
             'objectId': self._serialize.url("object_id", object_id, 'str'),
             'tenantID': self._serialize.url("self.config.tenant_id", self.config.tenant_id, 'str')
@@ -593,3 +601,4 @@ def update_password_credentials(
         if raw:
             client_raw_response = ClientRawResponse(None, response)
             return client_raw_response
+    update_password_credentials.metadata = {'url': '/{tenantID}/servicePrincipals/{objectId}/passwordCredentials'}
diff --git a/azure-graphrbac/azure/graphrbac/operations/users_operations.py b/azure-graphrbac/azure/graphrbac/operations/users_operations.py
index 2bc102a62532..a7f16e13b9ab 100644
--- a/azure-graphrbac/azure/graphrbac/operations/users_operations.py
+++ b/azure-graphrbac/azure/graphrbac/operations/users_operations.py
@@ -21,7 +21,7 @@ class UsersOperations(object):
     :param client: Client for service requests.
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
-    :param deserializer: An objec model deserializer.
+    :param deserializer: An object model deserializer.
     :ivar api_version: Client API version. Constant value: "1.6".
     """
 
@@ -54,7 +54,7 @@ def create(
          :class:`GraphErrorException<azure.graphrbac.models.GraphErrorException>`
         """
         # Construct URL
-        url = '/{tenantID}/users'
+        url = self.create.metadata['url']
         path_format_arguments = {
             'tenantID': self._serialize.url("self.config.tenant_id", self.config.tenant_id, 'str')
         }
@@ -95,6 +95,7 @@ def create(
             return client_raw_response
 
         return deserialized
+    create.metadata = {'url': '/{tenantID}/users'}
 
     def list(
             self, filter=None, custom_headers=None, raw=False, **operation_config):
@@ -117,7 +118,7 @@ def internal_paging(next_link=None, raw=False):
 
             if not next_link:
                 # Construct URL
-                url = '/{tenantID}/users'
+                url = self.list.metadata['url']
                 path_format_arguments = {
                     'tenantID': self._serialize.url("self.config.tenant_id", self.config.tenant_id, 'str')
                 }
@@ -168,6 +169,7 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
+    list.metadata = {'url': '/{tenantID}/users'}
 
     def get(
             self, upn_or_object_id, custom_headers=None, raw=False, **operation_config):
@@ -188,7 +190,7 @@ def get(
          :class:`GraphErrorException<azure.graphrbac.models.GraphErrorException>`
         """
         # Construct URL
-        url = '/{tenantID}/users/{upnOrObjectId}'
+        url = self.get.metadata['url']
         path_format_arguments = {
             'upnOrObjectId': self._serialize.url("upn_or_object_id", upn_or_object_id, 'str'),
             'tenantID': self._serialize.url("self.config.tenant_id", self.config.tenant_id, 'str')
@@ -226,6 +228,7 @@ def get(
             return client_raw_response
 
         return deserialized
+    get.metadata = {'url': '/{tenantID}/users/{upnOrObjectId}'}
 
     def update(
             self, upn_or_object_id, parameters, custom_headers=None, raw=False, **operation_config):
@@ -247,7 +250,7 @@ def update(
          :class:`GraphErrorException<azure.graphrbac.models.GraphErrorException>`
         """
         # Construct URL
-        url = '/{tenantID}/users/{upnOrObjectId}'
+        url = self.update.metadata['url']
         path_format_arguments = {
             'upnOrObjectId': self._serialize.url("upn_or_object_id", upn_or_object_id, 'str'),
             'tenantID': self._serialize.url("self.config.tenant_id", self.config.tenant_id, 'str')
@@ -282,6 +285,7 @@ def update(
         if raw:
             client_raw_response = ClientRawResponse(None, response)
             return client_raw_response
+    update.metadata = {'url': '/{tenantID}/users/{upnOrObjectId}'}
 
     def delete(
             self, upn_or_object_id, custom_headers=None, raw=False, **operation_config):
@@ -301,7 +305,7 @@ def delete(
          :class:`GraphErrorException<azure.graphrbac.models.GraphErrorException>`
         """
         # Construct URL
-        url = '/{tenantID}/users/{upnOrObjectId}'
+        url = self.delete.metadata['url']
         path_format_arguments = {
             'upnOrObjectId': self._serialize.url("upn_or_object_id", upn_or_object_id, 'str'),
             'tenantID': self._serialize.url("self.config.tenant_id", self.config.tenant_id, 'str')
@@ -332,6 +336,7 @@ def delete(
         if raw:
             client_raw_response = ClientRawResponse(None, response)
             return client_raw_response
+    delete.metadata = {'url': '/{tenantID}/users/{upnOrObjectId}'}
 
     def get_member_groups(
             self, object_id, security_enabled_only, additional_properties=None, custom_headers=None, raw=False, **operation_config):
@@ -364,7 +369,7 @@ def internal_paging(next_link=None, raw=False):
 
             if not next_link:
                 # Construct URL
-                url = '/{tenantID}/users/{objectId}/getMemberGroups'
+                url = self.get_member_groups.metadata['url']
                 path_format_arguments = {
                     'objectId': self._serialize.url("object_id", object_id, 'str'),
                     'tenantID': self._serialize.url("self.config.tenant_id", self.config.tenant_id, 'str')
@@ -411,3 +416,4 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
+    get_member_groups.metadata = {'url': '/{tenantID}/users/{objectId}/getMemberGroups'}
diff --git a/azure-graphrbac/azure/graphrbac/version.py b/azure-graphrbac/azure/graphrbac/version.py
index 57866fdf17d0..60bd31944182 100644
--- a/azure-graphrbac/azure/graphrbac/version.py
+++ b/azure-graphrbac/azure/graphrbac/version.py
@@ -9,5 +9,5 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "0.40.0"
+VERSION = "1.6"