diff --git a/azure-mgmt-resource/HISTORY.rst b/azure-mgmt-resource/HISTORY.rst
index 1eb3b395765e..073f68735637 100644
--- a/azure-mgmt-resource/HISTORY.rst
+++ b/azure-mgmt-resource/HISTORY.rst
@@ -3,6 +3,14 @@
 Release History
 ===============
 
+2.0.0 (2018-07-20)
+++++++++++++++++++
+
+**Features**
+
+- Identity class has now a user_assigned_identities attribute
+- Client class can be used as a context manager to keep the underlying HTTP session open for performance
+
 2.0.0rc2 (2018-06-13)
 +++++++++++++++++++++
 
@@ -56,7 +64,7 @@ This version uses a next-generation code generator that *might* introduce breaki
 
   - Return type changes from `msrestazure.azure_operation.AzureOperationPoller` to `msrest.polling.LROPoller`. External API is the same.
   - Return type is now **always** a `msrest.polling.LROPoller`, regardless of the optional parameters used.
-  - The behavior has changed when using `raw=True`. Instead of returning the initial call result as `ClientRawResponse`, 
+  - The behavior has changed when using `raw=True`. Instead of returning the initial call result as `ClientRawResponse`,
     without polling, now this returns an LROPoller. After polling, the final resource will be returned as a `ClientRawResponse`.
   - New `polling` parameter. The default behavior is `Polling=True` which will poll using ARM algorithm. When `Polling=False`,
     the response of the initial call will be returned without polling.
@@ -123,8 +131,8 @@ This version uses a next-generation code generator that *might* introduce breaki
 
 **Disclaimer**
 
-- We removed the "filter" parameter of policy_definitions.list method. 
-  However, we don't upgrade the  major version of the package, since this parameter has no meaning 
+- We removed the "filter" parameter of policy_definitions.list method.
+  However, we don't upgrade the  major version of the package, since this parameter has no meaning
   for the RestAPI and there is no way any Python users would have been able to use it anyway.
 
 1.1.0 (2017-05-15)
diff --git a/azure-mgmt-resource/azure/mgmt/resource/features/feature_client.py b/azure-mgmt-resource/azure/mgmt/resource/features/feature_client.py
index 589207a785b6..7da03829ab59 100644
--- a/azure-mgmt-resource/azure/mgmt/resource/features/feature_client.py
+++ b/azure-mgmt-resource/azure/mgmt/resource/features/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
 
@@ -55,7 +55,7 @@ def __init__(
         self.api_version = api_version
 
 
-class FeatureClient(MultiApiClientMixin):
+class FeatureClient(MultiApiClientMixin, 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.
@@ -83,17 +83,14 @@ class FeatureClient(MultiApiClientMixin):
     )
 
     def __init__(self, credentials, subscription_id, api_version=None, base_url=None, profile=KnownProfiles.default):
+        self.config = FeatureClientConfiguration(credentials, subscription_id, api_version, base_url)
         super(FeatureClient, self).__init__(
-            credentials=credentials,
-            subscription_id=subscription_id,
+            credentials,
+            self.config,
             api_version=api_version,
-            base_url=base_url,
             profile=profile
         )
 
-        self.config = FeatureClientConfiguration(credentials, subscription_id, api_version, base_url)
-        self._client = ServiceClient(self.config.credentials, self.config)
-
 ############ Generated from here ############
 
     @classmethod
@@ -110,7 +107,7 @@ def models(cls, api_version=DEFAULT_API_VERSION):
             from .v2015_12_01 import models
             return models
         raise NotImplementedError("APIVersion {} is not available".format(api_version))
-    
+
     @property
     def features(self):
         """Instance depends on the API version:
diff --git a/azure-mgmt-resource/azure/mgmt/resource/links/management_link_client.py b/azure-mgmt-resource/azure/mgmt/resource/links/management_link_client.py
index d7120d8966a6..d9285a49f396 100644
--- a/azure-mgmt-resource/azure/mgmt/resource/links/management_link_client.py
+++ b/azure-mgmt-resource/azure/mgmt/resource/links/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
 
@@ -50,7 +50,7 @@ def __init__(
         self.subscription_id = subscription_id
 
 
-class ManagementLinkClient(MultiApiClientMixin):
+class ManagementLinkClient(MultiApiClientMixin, 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.
@@ -78,17 +78,14 @@ class ManagementLinkClient(MultiApiClientMixin):
     )
 
     def __init__(self, credentials, subscription_id, api_version=None, base_url=None, profile=KnownProfiles.default):
+        self.config = ManagementLinkClientConfiguration(credentials, subscription_id, base_url)
         super(ManagementLinkClient, self).__init__(
-            credentials=credentials,
-            subscription_id=subscription_id,
+            credentials,
+            self.config,
             api_version=api_version,
-            base_url=base_url,
             profile=profile
         )
 
-        self.config = ManagementLinkClientConfiguration(credentials, subscription_id, base_url)
-        self._client = ServiceClient(self.config.credentials, self.config)
-
 ############ Generated from here ############
 
     @classmethod
@@ -105,7 +102,7 @@ def models(cls, api_version=DEFAULT_API_VERSION):
             from .v2016_09_01 import models
             return models
         raise NotImplementedError("APIVersion {} is not available".format(api_version))
-    
+
     @property
     def resource_links(self):
         """Instance depends on the API version:
diff --git a/azure-mgmt-resource/azure/mgmt/resource/locks/management_lock_client.py b/azure-mgmt-resource/azure/mgmt/resource/locks/management_lock_client.py
index 878d01163393..72e6d8c65694 100644
--- a/azure-mgmt-resource/azure/mgmt/resource/locks/management_lock_client.py
+++ b/azure-mgmt-resource/azure/mgmt/resource/locks/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
 
@@ -50,7 +50,7 @@ def __init__(
         self.subscription_id = subscription_id
 
 
-class ManagementLockClient(MultiApiClientMixin):
+class ManagementLockClient(MultiApiClientMixin, SDKClient):
     """Azure resources can be locked to prevent other users in your organization from deleting or modifying resources.
 
     :ivar config: Configuration for client.
@@ -78,17 +78,14 @@ class ManagementLockClient(MultiApiClientMixin):
     )
 
     def __init__(self, credentials, subscription_id, api_version=None, base_url=None, profile=KnownProfiles.default):
+        self.config = ManagementLockClientConfiguration(credentials, subscription_id, base_url)
         super(ManagementLockClient, self).__init__(
-            credentials=credentials,
-            subscription_id=subscription_id,
+            credentials,
+            self.config,
             api_version=api_version,
-            base_url=base_url,
             profile=profile
         )
 
-        self.config = ManagementLockClientConfiguration(credentials, subscription_id, base_url)
-        self._client = ServiceClient(self.config.credentials, self.config)
-
 ############ Generated from here ############
 
     @classmethod
@@ -109,7 +106,7 @@ def models(cls, api_version=DEFAULT_API_VERSION):
             from .v2016_09_01 import models
             return models
         raise NotImplementedError("APIVersion {} is not available".format(api_version))
-    
+
     @property
     def management_locks(self):
         """Instance depends on the API version:
diff --git a/azure-mgmt-resource/azure/mgmt/resource/policy/policy_client.py b/azure-mgmt-resource/azure/mgmt/resource/policy/policy_client.py
index de3e67a5d2dd..41b3a703e42e 100644
--- a/azure-mgmt-resource/azure/mgmt/resource/policy/policy_client.py
+++ b/azure-mgmt-resource/azure/mgmt/resource/policy/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
 
@@ -50,7 +50,7 @@ def __init__(
         self.subscription_id = subscription_id
 
 
-class PolicyClient(MultiApiClientMixin):
+class PolicyClient(MultiApiClientMixin, 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.
@@ -78,17 +78,14 @@ class PolicyClient(MultiApiClientMixin):
     )
 
     def __init__(self, credentials, subscription_id, api_version=None, base_url=None, profile=KnownProfiles.default):
+        self.config = PolicyClientConfiguration(credentials, subscription_id, base_url)
         super(PolicyClient, self).__init__(
-            credentials=credentials,
-            subscription_id=subscription_id,
+            credentials,
+            self.config,
             api_version=api_version,
-            base_url=base_url,
             profile=profile
         )
 
-        self.config = PolicyClientConfiguration(credentials, subscription_id, base_url)
-        self._client = ServiceClient(self.config.credentials, self.config)
-
 ############ Generated from here ############
 
     @classmethod
diff --git a/azure-mgmt-resource/azure/mgmt/resource/policy/v2016_12_01/operations/policy_assignments_operations.py b/azure-mgmt-resource/azure/mgmt/resource/policy/v2016_12_01/operations/policy_assignments_operations.py
index 1b5de5c73aa4..8a27c690b238 100644
--- a/azure-mgmt-resource/azure/mgmt/resource/policy/v2016_12_01/operations/policy_assignments_operations.py
+++ b/azure-mgmt-resource/azure/mgmt/resource/policy/v2016_12_01/operations/policy_assignments_operations.py
@@ -10,7 +10,6 @@
 # --------------------------------------------------------------------------
 
 import uuid
-import warnings
 from msrest.pipeline import ClientRawResponse
 from msrestazure.azure_exceptions import CloudError
 
@@ -314,9 +313,6 @@ def list_for_resource(
             self, resource_group_name, resource_provider_namespace, parent_resource_path, resource_type, resource_name, filter=None, custom_headers=None, raw=False, **operation_config):
         """Gets policy assignments for a resource.
 
-        .. warning::
-           This method is deprecated
-
         :param resource_group_name: The name of the resource group containing
          the resource. The name is case insensitive.
         :type resource_group_name: str
@@ -342,7 +338,6 @@ def list_for_resource(
          ~azure.mgmt.resource.policy.v2016_12_01.models.PolicyAssignmentPaged[~azure.mgmt.resource.policy.v2016_12_01.models.PolicyAssignment]
         :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
         """
-        warnings.warn("Method list_for_resource is deprecated", DeprecationWarning)
         def internal_paging(next_link=None, raw=False):
 
             if not next_link:
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 16d57610fef0..5b3ed9584044 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
@@ -9,7 +9,6 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-import warnings
 from msrest.service_client import SDKClient
 from msrest import Serializer, Deserializer
 from msrestazure import AzureConfiguration
diff --git a/azure-mgmt-resource/azure/mgmt/resource/policy/v2017_06_01_preview/operations/policy_assignments_operations.py b/azure-mgmt-resource/azure/mgmt/resource/policy/v2017_06_01_preview/operations/policy_assignments_operations.py
index 3338ae8646b2..fbfc016db7c3 100644
--- a/azure-mgmt-resource/azure/mgmt/resource/policy/v2017_06_01_preview/operations/policy_assignments_operations.py
+++ b/azure-mgmt-resource/azure/mgmt/resource/policy/v2017_06_01_preview/operations/policy_assignments_operations.py
@@ -10,7 +10,6 @@
 # --------------------------------------------------------------------------
 
 import uuid
-import warnings
 from msrest.pipeline import ClientRawResponse
 
 from .. import models
@@ -309,9 +308,6 @@ def list_for_resource(
             self, resource_group_name, resource_provider_namespace, parent_resource_path, resource_type, resource_name, filter=None, custom_headers=None, raw=False, **operation_config):
         """Gets policy assignments for a resource.
 
-        .. warning::
-           This method is deprecated
-
         :param resource_group_name: The name of the resource group containing
          the resource. The name is case insensitive.
         :type resource_group_name: str
@@ -338,7 +334,6 @@ def list_for_resource(
         :raises:
          :class:`ErrorResponseException<azure.mgmt.resource.policy.v2017_06_01_preview.models.ErrorResponseException>`
         """
-        warnings.warn("Method list_for_resource is deprecated", DeprecationWarning)
         def internal_paging(next_link=None, raw=False):
 
             if not next_link:
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 381f4f713ac5..d1c7ed935275 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
@@ -9,7 +9,6 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-import warnings
 from msrest.service_client import SDKClient
 from msrest import Serializer, Deserializer
 from msrestazure import AzureConfiguration
diff --git a/azure-mgmt-resource/azure/mgmt/resource/resources/resource_management_client.py b/azure-mgmt-resource/azure/mgmt/resource/resources/resource_management_client.py
index d624fa1c2e68..961677f13f9b 100644
--- a/azure-mgmt-resource/azure/mgmt/resource/resources/resource_management_client.py
+++ b/azure-mgmt-resource/azure/mgmt/resource/resources/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
 
@@ -50,7 +50,7 @@ def __init__(
         self.subscription_id = subscription_id
 
 
-class ResourceManagementClient(MultiApiClientMixin):
+class ResourceManagementClient(MultiApiClientMixin, SDKClient):
     """Provides operations for working with resources and resource groups.
 
     :ivar config: Configuration for client.
@@ -78,17 +78,14 @@ class ResourceManagementClient(MultiApiClientMixin):
     )
 
     def __init__(self, credentials, subscription_id, api_version=None, base_url=None, profile=KnownProfiles.default):
+        self.config = ResourceManagementClientConfiguration(credentials, subscription_id, base_url)
         super(ResourceManagementClient, self).__init__(
-            credentials=credentials,
-            subscription_id=subscription_id,
+            credentials,
+            self.config,
             api_version=api_version,
-            base_url=base_url,
             profile=profile
         )
 
-        self.config = ResourceManagementClientConfiguration(credentials, subscription_id, base_url)
-        self._client = ServiceClient(self.config.credentials, self.config)
-
 ############ Generated from here ############
 
     @classmethod
diff --git a/azure-mgmt-resource/azure/mgmt/resource/resources/v2018_05_01/models/__init__.py b/azure-mgmt-resource/azure/mgmt/resource/resources/v2018_05_01/models/__init__.py
index ae4447cedf0d..8e763379cfca 100644
--- a/azure-mgmt-resource/azure/mgmt/resource/resources/v2018_05_01/models/__init__.py
+++ b/azure-mgmt-resource/azure/mgmt/resource/resources/v2018_05_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 .identity_user_assigned_identities_value_py3 import IdentityUserAssignedIdentitiesValue
     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 .identity_user_assigned_identities_value import IdentityUserAssignedIdentitiesValue
     from .identity import Identity
     from .generic_resource import GenericResource
     from .resource_group_properties import ResourceGroupProperties
@@ -129,6 +131,7 @@
     'DeploymentExtended',
     'Plan',
     'Sku',
+    'IdentityUserAssignedIdentitiesValue',
     'Identity',
     'GenericResource',
     'ResourceGroupProperties',
diff --git a/azure-mgmt-resource/azure/mgmt/resource/resources/v2018_05_01/models/identity.py b/azure-mgmt-resource/azure/mgmt/resource/resources/v2018_05_01/models/identity.py
index 8b43780d01f6..0f7499f31cfa 100644
--- a/azure-mgmt-resource/azure/mgmt/resource/resources/v2018_05_01/models/identity.py
+++ b/azure-mgmt-resource/azure/mgmt/resource/resources/v2018_05_01/models/identity.py
@@ -26,6 +26,12 @@ class Identity(Model):
      'UserAssigned', 'SystemAssigned, UserAssigned', 'None'
     :type type: str or
      ~azure.mgmt.resource.resources.v2018_05_01.models.ResourceIdentityType
+    :param user_assigned_identities: The list of user identities associated
+     with the resource. The user identity dictionary key references will be ARM
+     resource ids in the form:
+     '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'.
+    :type user_assigned_identities: dict[str,
+     ~azure.mgmt.resource.resources.v2018_05_01.models.IdentityUserAssignedIdentitiesValue]
     """
 
     _validation = {
@@ -37,6 +43,7 @@ class Identity(Model):
         'principal_id': {'key': 'principalId', 'type': 'str'},
         'tenant_id': {'key': 'tenantId', 'type': 'str'},
         'type': {'key': 'type', 'type': 'ResourceIdentityType'},
+        'user_assigned_identities': {'key': 'userAssignedIdentities', 'type': '{IdentityUserAssignedIdentitiesValue}'},
     }
 
     def __init__(self, **kwargs):
@@ -44,3 +51,4 @@ def __init__(self, **kwargs):
         self.principal_id = None
         self.tenant_id = None
         self.type = kwargs.get('type', None)
+        self.user_assigned_identities = kwargs.get('user_assigned_identities', None)
diff --git a/azure-mgmt-resource/azure/mgmt/resource/resources/v2018_05_01/models/identity_py3.py b/azure-mgmt-resource/azure/mgmt/resource/resources/v2018_05_01/models/identity_py3.py
index f3e375c25b3a..6624bd2c5cf2 100644
--- a/azure-mgmt-resource/azure/mgmt/resource/resources/v2018_05_01/models/identity_py3.py
+++ b/azure-mgmt-resource/azure/mgmt/resource/resources/v2018_05_01/models/identity_py3.py
@@ -26,6 +26,12 @@ class Identity(Model):
      'UserAssigned', 'SystemAssigned, UserAssigned', 'None'
     :type type: str or
      ~azure.mgmt.resource.resources.v2018_05_01.models.ResourceIdentityType
+    :param user_assigned_identities: The list of user identities associated
+     with the resource. The user identity dictionary key references will be ARM
+     resource ids in the form:
+     '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'.
+    :type user_assigned_identities: dict[str,
+     ~azure.mgmt.resource.resources.v2018_05_01.models.IdentityUserAssignedIdentitiesValue]
     """
 
     _validation = {
@@ -37,10 +43,12 @@ class Identity(Model):
         'principal_id': {'key': 'principalId', 'type': 'str'},
         'tenant_id': {'key': 'tenantId', 'type': 'str'},
         'type': {'key': 'type', 'type': 'ResourceIdentityType'},
+        'user_assigned_identities': {'key': 'userAssignedIdentities', 'type': '{IdentityUserAssignedIdentitiesValue}'},
     }
 
-    def __init__(self, *, type=None, **kwargs) -> None:
+    def __init__(self, *, type=None, user_assigned_identities=None, **kwargs) -> None:
         super(Identity, self).__init__(**kwargs)
         self.principal_id = None
         self.tenant_id = None
         self.type = type
+        self.user_assigned_identities = user_assigned_identities
diff --git a/azure-mgmt-resource/azure/mgmt/resource/resources/v2018_05_01/models/identity_user_assigned_identities_value.py b/azure-mgmt-resource/azure/mgmt/resource/resources/v2018_05_01/models/identity_user_assigned_identities_value.py
new file mode 100644
index 000000000000..d4f566ff2086
--- /dev/null
+++ b/azure-mgmt-resource/azure/mgmt/resource/resources/v2018_05_01/models/identity_user_assigned_identities_value.py
@@ -0,0 +1,40 @@
+# 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 IdentityUserAssignedIdentitiesValue(Model):
+    """IdentityUserAssignedIdentitiesValue.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar principal_id: The principal id of user assigned identity.
+    :vartype principal_id: str
+    :ivar client_id: The client id of user assigned identity.
+    :vartype client_id: str
+    """
+
+    _validation = {
+        'principal_id': {'readonly': True},
+        'client_id': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'principal_id': {'key': 'principalId', 'type': 'str'},
+        'client_id': {'key': 'clientId', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(IdentityUserAssignedIdentitiesValue, self).__init__(**kwargs)
+        self.principal_id = None
+        self.client_id = None
diff --git a/azure-mgmt-resource/azure/mgmt/resource/resources/v2018_05_01/models/identity_user_assigned_identities_value_py3.py b/azure-mgmt-resource/azure/mgmt/resource/resources/v2018_05_01/models/identity_user_assigned_identities_value_py3.py
new file mode 100644
index 000000000000..16159b444f4f
--- /dev/null
+++ b/azure-mgmt-resource/azure/mgmt/resource/resources/v2018_05_01/models/identity_user_assigned_identities_value_py3.py
@@ -0,0 +1,40 @@
+# 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 IdentityUserAssignedIdentitiesValue(Model):
+    """IdentityUserAssignedIdentitiesValue.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar principal_id: The principal id of user assigned identity.
+    :vartype principal_id: str
+    :ivar client_id: The client id of user assigned identity.
+    :vartype client_id: str
+    """
+
+    _validation = {
+        'principal_id': {'readonly': True},
+        'client_id': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'principal_id': {'key': 'principalId', 'type': 'str'},
+        'client_id': {'key': 'clientId', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(IdentityUserAssignedIdentitiesValue, self).__init__(**kwargs)
+        self.principal_id = None
+        self.client_id = None
diff --git a/azure-mgmt-resource/azure/mgmt/resource/subscriptions/subscription_client.py b/azure-mgmt-resource/azure/mgmt/resource/subscriptions/subscription_client.py
index af4374d65af4..7b51cb189f40 100644
--- a/azure-mgmt-resource/azure/mgmt/resource/subscriptions/subscription_client.py
+++ b/azure-mgmt-resource/azure/mgmt/resource/subscriptions/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
 
@@ -45,7 +45,7 @@ def __init__(
         self.credentials = credentials
 
 
-class SubscriptionClient(MultiApiClientMixin):
+class SubscriptionClient(MultiApiClientMixin, 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.
@@ -71,16 +71,14 @@ class SubscriptionClient(MultiApiClientMixin):
     )
 
     def __init__(self, credentials, api_version=None, base_url=None, profile=KnownProfiles.default):
+        self.config = SubscriptionClientConfiguration(credentials, base_url)
         super(SubscriptionClient, self).__init__(
-            credentials=credentials,
+            credentials,
+            self.config,
             api_version=api_version,
-            base_url=base_url,
             profile=profile
         )
 
-        self.config = SubscriptionClientConfiguration(credentials, base_url)
-        self._client = ServiceClient(self.config.credentials, self.config)
-
 ############ Generated from here ############
 
     @classmethod
@@ -97,7 +95,7 @@ def models(cls, api_version=DEFAULT_API_VERSION):
             from .v2016_06_01 import models
             return models
         raise NotImplementedError("APIVersion {} is not available".format(api_version))
-    
+
     @property
     def subscriptions(self):
         """Instance depends on the API version:
diff --git a/azure-mgmt-resource/azure/mgmt/resource/version.py b/azure-mgmt-resource/azure/mgmt/resource/version.py
index 9a4b5b101553..88729157c488 100644
--- a/azure-mgmt-resource/azure/mgmt/resource/version.py
+++ b/azure-mgmt-resource/azure/mgmt/resource/version.py
@@ -5,4 +5,4 @@
 # license information.
 # --------------------------------------------------------------------------
 
-VERSION = "2.0.0rc2"
+VERSION = "2.0.0"
diff --git a/azure-mgmt-resource/build.json b/azure-mgmt-resource/build.json
deleted file mode 100644
index 0d94fbaaa8ee..000000000000
--- a/azure-mgmt-resource/build.json
+++ /dev/null
@@ -1 +0,0 @@
-{"autorest": "1.0.1-20170503-2300-nightly", "date": "2017-05-04T19:23:06Z", "version": ""}
\ No newline at end of file