diff --git a/azure-mgmt-resource/azure/mgmt/resource/features/v2015_12_01/feature_client.py b/azure-mgmt-resource/azure/mgmt/resource/features/v2015_12_01/feature_client.py
index ebf41ab29b36..3dfaec20c691 100644
--- a/azure-mgmt-resource/azure/mgmt/resource/features/v2015_12_01/feature_client.py
+++ b/azure-mgmt-resource/azure/mgmt/resource/features/v2015_12_01/feature_client.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from msrest.service_client import ServiceClient
+from msrest.service_client import SDKClient
 from msrest import Serializer, Deserializer
 from msrestazure import AzureConfiguration
 from .version import VERSION
@@ -49,7 +49,7 @@ def __init__(
         self.subscription_id = subscription_id
 
 
-class FeatureClient(object):
+class FeatureClient(SDKClient):
     """Azure Feature Exposure Control (AFEC) provides a mechanism for the resource providers to control feature exposure to users. Resource providers typically use this mechanism to provide public/private preview for new features prior to making them generally available. Users need to explicitly register for AFEC features to get access to such functionality.
 
     :ivar config: Configuration for client.
@@ -70,7 +70,7 @@ def __init__(
             self, credentials, subscription_id, base_url=None):
 
         self.config = FeatureClientConfiguration(credentials, subscription_id, base_url)
-        self._client = ServiceClient(self.config.credentials, self.config)
+        super(FeatureClient, self).__init__(self.config.credentials, self.config)
 
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
         self.api_version = '2015-12-01'
diff --git a/azure-mgmt-resource/azure/mgmt/resource/links/v2016_09_01/management_link_client.py b/azure-mgmt-resource/azure/mgmt/resource/links/v2016_09_01/management_link_client.py
index 1e42f86e274b..9820f661c595 100644
--- a/azure-mgmt-resource/azure/mgmt/resource/links/v2016_09_01/management_link_client.py
+++ b/azure-mgmt-resource/azure/mgmt/resource/links/v2016_09_01/management_link_client.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from msrest.service_client import ServiceClient
+from msrest.service_client import SDKClient
 from msrest import Serializer, Deserializer
 from msrestazure import AzureConfiguration
 from .version import VERSION
@@ -49,7 +49,7 @@ def __init__(
         self.subscription_id = subscription_id
 
 
-class ManagementLinkClient(object):
+class ManagementLinkClient(SDKClient):
     """Azure resources can be linked together to form logical relationships. You can establish links between resources belonging to different resource groups. However, all the linked resources must belong to the same subscription. Each resource can be linked to 50 other resources. If any of the linked resources are deleted or moved, the link owner must clean up the remaining link.
 
     :ivar config: Configuration for client.
@@ -70,7 +70,7 @@ def __init__(
             self, credentials, subscription_id, base_url=None):
 
         self.config = ManagementLinkClientConfiguration(credentials, subscription_id, base_url)
-        self._client = ServiceClient(self.config.credentials, self.config)
+        super(ManagementLinkClient, self).__init__(self.config.credentials, self.config)
 
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
         self.api_version = '2016-09-01'
diff --git a/azure-mgmt-resource/azure/mgmt/resource/locks/v2015_01_01/management_lock_client.py b/azure-mgmt-resource/azure/mgmt/resource/locks/v2015_01_01/management_lock_client.py
index 180930003d4b..6fc53b2fae11 100644
--- a/azure-mgmt-resource/azure/mgmt/resource/locks/v2015_01_01/management_lock_client.py
+++ b/azure-mgmt-resource/azure/mgmt/resource/locks/v2015_01_01/management_lock_client.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from msrest.service_client import ServiceClient
+from msrest.service_client import SDKClient
 from msrest import Serializer, Deserializer
 from msrestazure import AzureConfiguration
 from .version import VERSION
@@ -51,7 +51,7 @@ def __init__(
         self.subscription_id = subscription_id
 
 
-class ManagementLockClient(object):
+class ManagementLockClient(SDKClient):
     """ManagementLockClient
 
     :ivar config: Configuration for client.
@@ -74,7 +74,7 @@ def __init__(
             self, credentials, subscription_id, base_url=None):
 
         self.config = ManagementLockClientConfiguration(credentials, subscription_id, base_url)
-        self._client = ServiceClient(self.config.credentials, self.config)
+        super(ManagementLockClient, self).__init__(self.config.credentials, self.config)
 
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
         self.api_version = '2015-01-01'
diff --git a/azure-mgmt-resource/azure/mgmt/resource/locks/v2016_09_01/management_lock_client.py b/azure-mgmt-resource/azure/mgmt/resource/locks/v2016_09_01/management_lock_client.py
index 9a2502a24577..193ccb0fe905 100644
--- a/azure-mgmt-resource/azure/mgmt/resource/locks/v2016_09_01/management_lock_client.py
+++ b/azure-mgmt-resource/azure/mgmt/resource/locks/v2016_09_01/management_lock_client.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from msrest.service_client import ServiceClient
+from msrest.service_client import SDKClient
 from msrest import Serializer, Deserializer
 from msrestazure import AzureConfiguration
 from .version import VERSION
@@ -49,7 +49,7 @@ def __init__(
         self.subscription_id = subscription_id
 
 
-class ManagementLockClient(object):
+class ManagementLockClient(SDKClient):
     """Azure resources can be locked to prevent other users in your organization from deleting or modifying resources.
 
     :ivar config: Configuration for client.
@@ -70,7 +70,7 @@ def __init__(
             self, credentials, subscription_id, base_url=None):
 
         self.config = ManagementLockClientConfiguration(credentials, subscription_id, base_url)
-        self._client = ServiceClient(self.config.credentials, self.config)
+        super(ManagementLockClient, self).__init__(self.config.credentials, self.config)
 
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
         self.api_version = '2016-09-01'
diff --git a/azure-mgmt-resource/azure/mgmt/resource/managedapplications/application_client.py b/azure-mgmt-resource/azure/mgmt/resource/managedapplications/application_client.py
index a42f5253e331..93562e98da94 100644
--- a/azure-mgmt-resource/azure/mgmt/resource/managedapplications/application_client.py
+++ b/azure-mgmt-resource/azure/mgmt/resource/managedapplications/application_client.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from msrest.service_client import ServiceClient
+from msrest.service_client import SDKClient
 from msrest import Serializer, Deserializer
 from msrestazure import AzureConfiguration
 from .version import VERSION
@@ -50,7 +50,7 @@ def __init__(
         self.subscription_id = subscription_id
 
 
-class ApplicationClient(object):
+class ApplicationClient(SDKClient):
     """ARM applications
 
     :ivar config: Configuration for client.
@@ -73,7 +73,7 @@ def __init__(
             self, credentials, subscription_id, base_url=None):
 
         self.config = ApplicationClientConfiguration(credentials, subscription_id, base_url)
-        self._client = ServiceClient(self.config.credentials, self.config)
+        super(ApplicationClient, self).__init__(self.config.credentials, self.config)
 
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
         self.api_version = '2017-09-01'
diff --git a/azure-mgmt-resource/azure/mgmt/resource/policy/v2015_10_01_preview/policy_client.py b/azure-mgmt-resource/azure/mgmt/resource/policy/v2015_10_01_preview/policy_client.py
index 95fb4ad75635..3ba02a11d719 100644
--- a/azure-mgmt-resource/azure/mgmt/resource/policy/v2015_10_01_preview/policy_client.py
+++ b/azure-mgmt-resource/azure/mgmt/resource/policy/v2015_10_01_preview/policy_client.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from msrest.service_client import ServiceClient
+from msrest.service_client import SDKClient
 from msrest import Serializer, Deserializer
 from msrestazure import AzureConfiguration
 from .version import VERSION
@@ -50,7 +50,7 @@ def __init__(
         self.subscription_id = subscription_id
 
 
-class PolicyClient(object):
+class PolicyClient(SDKClient):
     """To manage and control access to your resources, you can define customized policies and assign them at a scope.
 
     :ivar config: Configuration for client.
@@ -73,7 +73,7 @@ def __init__(
             self, credentials, subscription_id, base_url=None):
 
         self.config = PolicyClientConfiguration(credentials, subscription_id, base_url)
-        self._client = ServiceClient(self.config.credentials, self.config)
+        super(PolicyClient, self).__init__(self.config.credentials, self.config)
 
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
         self.api_version = '2015-10-01-preview'
diff --git a/azure-mgmt-resource/azure/mgmt/resource/policy/v2016_04_01/policy_client.py b/azure-mgmt-resource/azure/mgmt/resource/policy/v2016_04_01/policy_client.py
index 58b00af11d08..c136e74d1831 100644
--- a/azure-mgmt-resource/azure/mgmt/resource/policy/v2016_04_01/policy_client.py
+++ b/azure-mgmt-resource/azure/mgmt/resource/policy/v2016_04_01/policy_client.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from msrest.service_client import ServiceClient
+from msrest.service_client import SDKClient
 from msrest import Serializer, Deserializer
 from msrestazure import AzureConfiguration
 from .version import VERSION
@@ -50,7 +50,7 @@ def __init__(
         self.subscription_id = subscription_id
 
 
-class PolicyClient(object):
+class PolicyClient(SDKClient):
     """To manage and control access to your resources, you can define customized policies and assign them at a scope.
 
     :ivar config: Configuration for client.
@@ -73,7 +73,7 @@ def __init__(
             self, credentials, subscription_id, base_url=None):
 
         self.config = PolicyClientConfiguration(credentials, subscription_id, base_url)
-        self._client = ServiceClient(self.config.credentials, self.config)
+        super(PolicyClient, self).__init__(self.config.credentials, self.config)
 
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
         self.api_version = '2016-04-01'
diff --git a/azure-mgmt-resource/azure/mgmt/resource/policy/v2016_12_01/policy_client.py b/azure-mgmt-resource/azure/mgmt/resource/policy/v2016_12_01/policy_client.py
index 33b6e7a11ba0..16d57610fef0 100644
--- a/azure-mgmt-resource/azure/mgmt/resource/policy/v2016_12_01/policy_client.py
+++ b/azure-mgmt-resource/azure/mgmt/resource/policy/v2016_12_01/policy_client.py
@@ -10,7 +10,7 @@
 # --------------------------------------------------------------------------
 
 import warnings
-from msrest.service_client import ServiceClient
+from msrest.service_client import SDKClient
 from msrest import Serializer, Deserializer
 from msrestazure import AzureConfiguration
 from .version import VERSION
@@ -51,7 +51,7 @@ def __init__(
         self.subscription_id = subscription_id
 
 
-class PolicyClient(object):
+class PolicyClient(SDKClient):
     """To manage and control access to your resources, you can define customized policies and assign them at a scope.
 
     :ivar config: Configuration for client.
@@ -74,7 +74,7 @@ def __init__(
             self, credentials, subscription_id, base_url=None):
 
         self.config = PolicyClientConfiguration(credentials, subscription_id, base_url)
-        self._client = ServiceClient(self.config.credentials, self.config)
+        super(PolicyClient, self).__init__(self.config.credentials, self.config)
 
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
         self.api_version = '2016-12-01'
diff --git a/azure-mgmt-resource/azure/mgmt/resource/policy/v2017_06_01_preview/policy_client.py b/azure-mgmt-resource/azure/mgmt/resource/policy/v2017_06_01_preview/policy_client.py
index c976879d6745..381f4f713ac5 100644
--- a/azure-mgmt-resource/azure/mgmt/resource/policy/v2017_06_01_preview/policy_client.py
+++ b/azure-mgmt-resource/azure/mgmt/resource/policy/v2017_06_01_preview/policy_client.py
@@ -10,7 +10,7 @@
 # --------------------------------------------------------------------------
 
 import warnings
-from msrest.service_client import ServiceClient
+from msrest.service_client import SDKClient
 from msrest import Serializer, Deserializer
 from msrestazure import AzureConfiguration
 from .version import VERSION
@@ -52,7 +52,7 @@ def __init__(
         self.subscription_id = subscription_id
 
 
-class PolicyClient(object):
+class PolicyClient(SDKClient):
     """To manage and control access to your resources, you can define customized policies and assign them at a scope.
 
     :ivar config: Configuration for client.
@@ -77,7 +77,7 @@ def __init__(
             self, credentials, subscription_id, base_url=None):
 
         self.config = PolicyClientConfiguration(credentials, subscription_id, base_url)
-        self._client = ServiceClient(self.config.credentials, self.config)
+        super(PolicyClient, self).__init__(self.config.credentials, self.config)
 
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
         self._serialize = Serializer(client_models)
diff --git a/azure-mgmt-resource/azure/mgmt/resource/resources/v2016_02_01/resource_management_client.py b/azure-mgmt-resource/azure/mgmt/resource/resources/v2016_02_01/resource_management_client.py
index bc8a7a9b1ca8..3870480becf6 100644
--- a/azure-mgmt-resource/azure/mgmt/resource/resources/v2016_02_01/resource_management_client.py
+++ b/azure-mgmt-resource/azure/mgmt/resource/resources/v2016_02_01/resource_management_client.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from msrest.service_client import ServiceClient
+from msrest.service_client import SDKClient
 from msrest import Serializer, Deserializer
 from msrestazure import AzureConfiguration
 from .version import VERSION
@@ -56,7 +56,7 @@ def __init__(
         self.subscription_id = subscription_id
 
 
-class ResourceManagementClient(object):
+class ResourceManagementClient(SDKClient):
     """ResourceManagementClient
 
     :ivar config: Configuration for client.
@@ -89,7 +89,7 @@ def __init__(
             self, credentials, subscription_id, base_url=None):
 
         self.config = ResourceManagementClientConfiguration(credentials, subscription_id, base_url)
-        self._client = ServiceClient(self.config.credentials, self.config)
+        super(ResourceManagementClient, self).__init__(self.config.credentials, self.config)
 
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
         self.api_version = '2016-02-01'
diff --git a/azure-mgmt-resource/azure/mgmt/resource/resources/v2016_09_01/resource_management_client.py b/azure-mgmt-resource/azure/mgmt/resource/resources/v2016_09_01/resource_management_client.py
index a8532ab43741..4fa4270256bb 100644
--- a/azure-mgmt-resource/azure/mgmt/resource/resources/v2016_09_01/resource_management_client.py
+++ b/azure-mgmt-resource/azure/mgmt/resource/resources/v2016_09_01/resource_management_client.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from msrest.service_client import ServiceClient
+from msrest.service_client import SDKClient
 from msrest import Serializer, Deserializer
 from msrestazure import AzureConfiguration
 from .version import VERSION
@@ -54,7 +54,7 @@ def __init__(
         self.subscription_id = subscription_id
 
 
-class ResourceManagementClient(object):
+class ResourceManagementClient(SDKClient):
     """Provides operations for working with resources and resource groups.
 
     :ivar config: Configuration for client.
@@ -85,7 +85,7 @@ def __init__(
             self, credentials, subscription_id, base_url=None):
 
         self.config = ResourceManagementClientConfiguration(credentials, subscription_id, base_url)
-        self._client = ServiceClient(self.config.credentials, self.config)
+        super(ResourceManagementClient, self).__init__(self.config.credentials, self.config)
 
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
         self.api_version = '2016-09-01'
diff --git a/azure-mgmt-resource/azure/mgmt/resource/resources/v2017_05_10/resource_management_client.py b/azure-mgmt-resource/azure/mgmt/resource/resources/v2017_05_10/resource_management_client.py
index 5b86f00197fb..1e8e488a20da 100644
--- a/azure-mgmt-resource/azure/mgmt/resource/resources/v2017_05_10/resource_management_client.py
+++ b/azure-mgmt-resource/azure/mgmt/resource/resources/v2017_05_10/resource_management_client.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from msrest.service_client import ServiceClient
+from msrest.service_client import SDKClient
 from msrest import Serializer, Deserializer
 from msrestazure import AzureConfiguration
 from .version import VERSION
@@ -54,7 +54,7 @@ def __init__(
         self.subscription_id = subscription_id
 
 
-class ResourceManagementClient(object):
+class ResourceManagementClient(SDKClient):
     """Provides operations for working with resources and resource groups.
 
     :ivar config: Configuration for client.
@@ -85,7 +85,7 @@ def __init__(
             self, credentials, subscription_id, base_url=None):
 
         self.config = ResourceManagementClientConfiguration(credentials, subscription_id, base_url)
-        self._client = ServiceClient(self.config.credentials, self.config)
+        super(ResourceManagementClient, self).__init__(self.config.credentials, self.config)
 
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
         self.api_version = '2017-05-10'
diff --git a/azure-mgmt-resource/azure/mgmt/resource/resources/v2018_02_01/models/__init__.py b/azure-mgmt-resource/azure/mgmt/resource/resources/v2018_02_01/models/__init__.py
index ae4447cedf0d..19574b3fb1a3 100644
--- a/azure-mgmt-resource/azure/mgmt/resource/resources/v2018_02_01/models/__init__.py
+++ b/azure-mgmt-resource/azure/mgmt/resource/resources/v2018_02_01/models/__init__.py
@@ -33,6 +33,7 @@
     from .deployment_extended_py3 import DeploymentExtended
     from .plan_py3 import Plan
     from .sku_py3 import Sku
+    from .user_defined_identity_py3 import UserDefinedIdentity
     from .identity_py3 import Identity
     from .generic_resource_py3 import GenericResource
     from .resource_group_properties_py3 import ResourceGroupProperties
@@ -75,6 +76,7 @@
     from .deployment_extended import DeploymentExtended
     from .plan import Plan
     from .sku import Sku
+    from .user_defined_identity import UserDefinedIdentity
     from .identity import Identity
     from .generic_resource import GenericResource
     from .resource_group_properties import ResourceGroupProperties
@@ -129,6 +131,7 @@
     'DeploymentExtended',
     'Plan',
     'Sku',
+    'UserDefinedIdentity',
     'Identity',
     'GenericResource',
     'ResourceGroupProperties',
diff --git a/azure-mgmt-resource/azure/mgmt/resource/resources/v2018_02_01/models/identity.py b/azure-mgmt-resource/azure/mgmt/resource/resources/v2018_02_01/models/identity.py
index 461cc8574f08..6075d8fac95c 100644
--- a/azure-mgmt-resource/azure/mgmt/resource/resources/v2018_02_01/models/identity.py
+++ b/azure-mgmt-resource/azure/mgmt/resource/resources/v2018_02_01/models/identity.py
@@ -22,6 +22,9 @@ class Identity(Model):
     :vartype principal_id: str
     :ivar tenant_id: The tenant ID of resource.
     :vartype tenant_id: str
+    :param identities:
+    :type identities: dict[str,
+     ~azure.mgmt.resource.resources.v2018_02_01.models.UserDefinedIdentity]
     :param type: The identity type. Possible values include: 'SystemAssigned',
      'UserAssigned', 'SystemAssigned, UserAssigned', 'None'
     :type type: str or
@@ -36,6 +39,7 @@ class Identity(Model):
     _attribute_map = {
         'principal_id': {'key': 'principalId', 'type': 'str'},
         'tenant_id': {'key': 'tenantId', 'type': 'str'},
+        'identities': {'key': 'identities', 'type': '{UserDefinedIdentity}'},
         'type': {'key': 'type', 'type': 'ResourceIdentityType'},
     }
 
@@ -43,4 +47,5 @@ def __init__(self, **kwargs):
         super(Identity, self).__init__(**kwargs)
         self.principal_id = None
         self.tenant_id = None
+        self.identities = kwargs.get('identities', None)
         self.type = kwargs.get('type', None)
diff --git a/azure-mgmt-resource/azure/mgmt/resource/resources/v2018_02_01/models/identity_py3.py b/azure-mgmt-resource/azure/mgmt/resource/resources/v2018_02_01/models/identity_py3.py
index 8222ca6ed4d5..1469d1ac1218 100644
--- a/azure-mgmt-resource/azure/mgmt/resource/resources/v2018_02_01/models/identity_py3.py
+++ b/azure-mgmt-resource/azure/mgmt/resource/resources/v2018_02_01/models/identity_py3.py
@@ -22,6 +22,9 @@ class Identity(Model):
     :vartype principal_id: str
     :ivar tenant_id: The tenant ID of resource.
     :vartype tenant_id: str
+    :param identities:
+    :type identities: dict[str,
+     ~azure.mgmt.resource.resources.v2018_02_01.models.UserDefinedIdentity]
     :param type: The identity type. Possible values include: 'SystemAssigned',
      'UserAssigned', 'SystemAssigned, UserAssigned', 'None'
     :type type: str or
@@ -36,11 +39,13 @@ class Identity(Model):
     _attribute_map = {
         'principal_id': {'key': 'principalId', 'type': 'str'},
         'tenant_id': {'key': 'tenantId', 'type': 'str'},
+        'identities': {'key': 'identities', 'type': '{UserDefinedIdentity}'},
         'type': {'key': 'type', 'type': 'ResourceIdentityType'},
     }
 
-    def __init__(self, *, type=None, **kwargs) -> None:
+    def __init__(self, *, identities=None, type=None, **kwargs) -> None:
         super(Identity, self).__init__(**kwargs)
         self.principal_id = None
         self.tenant_id = None
+        self.identities = identities
         self.type = type
diff --git a/azure-mgmt-resource/azure/mgmt/resource/resources/v2018_02_01/models/user_defined_identity.py b/azure-mgmt-resource/azure/mgmt/resource/resources/v2018_02_01/models/user_defined_identity.py
new file mode 100644
index 000000000000..a4bb2799c080
--- /dev/null
+++ b/azure-mgmt-resource/azure/mgmt/resource/resources/v2018_02_01/models/user_defined_identity.py
@@ -0,0 +1,39 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# 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 Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class UserDefinedIdentity(Model):
+    """UserDefinedIdentity.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param client_id: Required.
+    :type client_id: str
+    :param principal_id: Required.
+    :type principal_id: str
+    """
+
+    _validation = {
+        'client_id': {'required': True},
+        'principal_id': {'required': True},
+    }
+
+    _attribute_map = {
+        'client_id': {'key': 'clientId', 'type': 'str'},
+        'principal_id': {'key': 'principalId', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(UserDefinedIdentity, self).__init__(**kwargs)
+        self.client_id = kwargs.get('client_id', None)
+        self.principal_id = kwargs.get('principal_id', None)
diff --git a/azure-mgmt-resource/azure/mgmt/resource/resources/v2018_02_01/models/user_defined_identity_py3.py b/azure-mgmt-resource/azure/mgmt/resource/resources/v2018_02_01/models/user_defined_identity_py3.py
new file mode 100644
index 000000000000..4cbd899edbab
--- /dev/null
+++ b/azure-mgmt-resource/azure/mgmt/resource/resources/v2018_02_01/models/user_defined_identity_py3.py
@@ -0,0 +1,39 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# 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 Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class UserDefinedIdentity(Model):
+    """UserDefinedIdentity.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param client_id: Required.
+    :type client_id: str
+    :param principal_id: Required.
+    :type principal_id: str
+    """
+
+    _validation = {
+        'client_id': {'required': True},
+        'principal_id': {'required': True},
+    }
+
+    _attribute_map = {
+        'client_id': {'key': 'clientId', 'type': 'str'},
+        'principal_id': {'key': 'principalId', 'type': 'str'},
+    }
+
+    def __init__(self, *, client_id: str, principal_id: str, **kwargs) -> None:
+        super(UserDefinedIdentity, self).__init__(**kwargs)
+        self.client_id = client_id
+        self.principal_id = principal_id
diff --git a/azure-mgmt-resource/azure/mgmt/resource/resources/v2018_02_01/resource_management_client.py b/azure-mgmt-resource/azure/mgmt/resource/resources/v2018_02_01/resource_management_client.py
index 9fac1285e238..1c34a9d14522 100644
--- a/azure-mgmt-resource/azure/mgmt/resource/resources/v2018_02_01/resource_management_client.py
+++ b/azure-mgmt-resource/azure/mgmt/resource/resources/v2018_02_01/resource_management_client.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from msrest.service_client import ServiceClient
+from msrest.service_client import SDKClient
 from msrest import Serializer, Deserializer
 from msrestazure import AzureConfiguration
 from .version import VERSION
@@ -54,7 +54,7 @@ def __init__(
         self.subscription_id = subscription_id
 
 
-class ResourceManagementClient(object):
+class ResourceManagementClient(SDKClient):
     """Provides operations for working with resources and resource groups.
 
     :ivar config: Configuration for client.
@@ -85,7 +85,7 @@ def __init__(
             self, credentials, subscription_id, base_url=None):
 
         self.config = ResourceManagementClientConfiguration(credentials, subscription_id, base_url)
-        self._client = ServiceClient(self.config.credentials, self.config)
+        super(ResourceManagementClient, self).__init__(self.config.credentials, self.config)
 
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
         self.api_version = '2018-02-01'
diff --git a/azure-mgmt-resource/azure/mgmt/resource/subscriptions/v2016_06_01/subscription_client.py b/azure-mgmt-resource/azure/mgmt/resource/subscriptions/v2016_06_01/subscription_client.py
index 9c69fc7862e4..deacfa9bab66 100644
--- a/azure-mgmt-resource/azure/mgmt/resource/subscriptions/v2016_06_01/subscription_client.py
+++ b/azure-mgmt-resource/azure/mgmt/resource/subscriptions/v2016_06_01/subscription_client.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from msrest.service_client import ServiceClient
+from msrest.service_client import SDKClient
 from msrest import Serializer, Deserializer
 from msrestazure import AzureConfiguration
 from .version import VERSION
@@ -45,7 +45,7 @@ def __init__(
         self.credentials = credentials
 
 
-class SubscriptionClient(object):
+class SubscriptionClient(SDKClient):
     """All resource groups and resources exist within subscriptions. These operation enable you get information about your subscriptions and tenants. A tenant is a dedicated instance of Azure Active Directory (Azure AD) for your organization.
 
     :ivar config: Configuration for client.
@@ -66,7 +66,7 @@ def __init__(
             self, credentials, base_url=None):
 
         self.config = SubscriptionClientConfiguration(credentials, base_url)
-        self._client = ServiceClient(self.config.credentials, self.config)
+        super(SubscriptionClient, self).__init__(self.config.credentials, self.config)
 
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
         self.api_version = '2016-06-01'