diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/__init__.py b/azure-mgmt-signalr/azure/mgmt/signalr/models/__init__.py
index 9ba920b7ea83..d5cf8d6c4b95 100644
--- a/azure-mgmt-signalr/azure/mgmt/signalr/models/__init__.py
+++ b/azure-mgmt-signalr/azure/mgmt/signalr/models/__init__.py
@@ -22,6 +22,7 @@
     from .signal_rresource_py3 import SignalRResource
     from .tracked_resource_py3 import TrackedResource
     from .resource_py3 import Resource
+    from .signal_rfeature_py3 import SignalRFeature
     from .signal_rcreate_or_update_properties_py3 import SignalRCreateOrUpdateProperties
     from .signal_rkeys_py3 import SignalRKeys
     from .regenerate_key_parameters_py3 import RegenerateKeyParameters
@@ -42,6 +43,7 @@
     from .signal_rresource import SignalRResource
     from .tracked_resource import TrackedResource
     from .resource import Resource
+    from .signal_rfeature import SignalRFeature
     from .signal_rcreate_or_update_properties import SignalRCreateOrUpdateProperties
     from .signal_rkeys import SignalRKeys
     from .regenerate_key_parameters import RegenerateKeyParameters
@@ -71,6 +73,7 @@
     'SignalRResource',
     'TrackedResource',
     'Resource',
+    'SignalRFeature',
     'SignalRCreateOrUpdateProperties',
     'SignalRKeys',
     'RegenerateKeyParameters',
diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/resource_sku.py b/azure-mgmt-signalr/azure/mgmt/signalr/models/resource_sku.py
index 2f9804893c80..68a842d44372 100644
--- a/azure-mgmt-signalr/azure/mgmt/signalr/models/resource_sku.py
+++ b/azure-mgmt-signalr/azure/mgmt/signalr/models/resource_sku.py
@@ -13,26 +13,26 @@
 
 
 class ResourceSku(Model):
-    """The billing information of the resource.(e.g. basic vs. standard).
+    """The billing information of the SignalR resource.
 
     All required parameters must be populated in order to send to Azure.
 
-    :param name: Required. The name of the SKU. This is typically a letter +
-     number code, such as A0 or P3.  Required (if sku is specified)
+    :param name: Required. The name of the SKU. Required.
+     Allowed values: Standard_S1, Free_F1
     :type name: str
-    :param tier: Optional tier of this particular SKU. `Basic` is deprecated,
-     use `Standard` instead. Possible values include: 'Free', 'Basic',
-     'Standard', 'Premium'
+    :param tier: Optional tier of this particular SKU. 'Standard' or 'Free'.
+     `Basic` is deprecated, use `Standard` instead. Possible values include:
+     'Free', 'Basic', 'Standard', 'Premium'
     :type tier: str or ~azure.mgmt.signalr.models.SignalRSkuTier
-    :param size: Optional, string. When the name field is the combination of
-     tier and some other value, this would be the standalone code.
+    :param size: Optional string. For future use.
     :type size: str
-    :param family: Optional, string. If the service has different generations
-     of hardware, for the same SKU, then that can be captured here.
+    :param family: Optional string. For future use.
     :type family: str
-    :param capacity: Optional, integer. If the SKU supports scale out/in then
-     the capacity integer should be included. If scale out/in is not
-     possible for the resource this may be omitted.
+    :param capacity: Optional, integer. The unit count of SignalR resource. 1
+     by default.
+     If present, following values are allowed:
+     Free: 1
+     Standard: 1,2,5,10,20,50,100
     :type capacity: int
     """
 
diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/resource_sku_py3.py b/azure-mgmt-signalr/azure/mgmt/signalr/models/resource_sku_py3.py
index bed8cd3f7077..0c26509b2ed7 100644
--- a/azure-mgmt-signalr/azure/mgmt/signalr/models/resource_sku_py3.py
+++ b/azure-mgmt-signalr/azure/mgmt/signalr/models/resource_sku_py3.py
@@ -13,26 +13,26 @@
 
 
 class ResourceSku(Model):
-    """The billing information of the resource.(e.g. basic vs. standard).
+    """The billing information of the SignalR resource.
 
     All required parameters must be populated in order to send to Azure.
 
-    :param name: Required. The name of the SKU. This is typically a letter +
-     number code, such as A0 or P3.  Required (if sku is specified)
+    :param name: Required. The name of the SKU. Required.
+     Allowed values: Standard_S1, Free_F1
     :type name: str
-    :param tier: Optional tier of this particular SKU. `Basic` is deprecated,
-     use `Standard` instead. Possible values include: 'Free', 'Basic',
-     'Standard', 'Premium'
+    :param tier: Optional tier of this particular SKU. 'Standard' or 'Free'.
+     `Basic` is deprecated, use `Standard` instead. Possible values include:
+     'Free', 'Basic', 'Standard', 'Premium'
     :type tier: str or ~azure.mgmt.signalr.models.SignalRSkuTier
-    :param size: Optional, string. When the name field is the combination of
-     tier and some other value, this would be the standalone code.
+    :param size: Optional string. For future use.
     :type size: str
-    :param family: Optional, string. If the service has different generations
-     of hardware, for the same SKU, then that can be captured here.
+    :param family: Optional string. For future use.
     :type family: str
-    :param capacity: Optional, integer. If the SKU supports scale out/in then
-     the capacity integer should be included. If scale out/in is not
-     possible for the resource this may be omitted.
+    :param capacity: Optional, integer. The unit count of SignalR resource. 1
+     by default.
+     If present, following values are allowed:
+     Free: 1
+     Standard: 1,2,5,10,20,50,100
     :type capacity: int
     """
 
diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rcreate_or_update_properties.py b/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rcreate_or_update_properties.py
index 4735f85fd6b2..174864edd66e 100644
--- a/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rcreate_or_update_properties.py
+++ b/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rcreate_or_update_properties.py
@@ -20,12 +20,23 @@ class SignalRCreateOrUpdateProperties(Model):
      The hostname will be of format:
      <hostNamePrefix>.service.signalr.net.
     :type host_name_prefix: str
+    :param features: List of SignalR featureFlags. e.g. ServiceMode.
+     FeatureFlags that are not included in the parameters for the update
+     operation will not be modified.
+     And the response will only include featureFlags that are explicitly set.
+     When a featureFlag is not explicitly set, SignalR service will use its
+     globally default value.
+     But keep in mind, the default value doesn't mean "false". It varies in
+     terms of different FeatureFlags.
+    :type features: list[~azure.mgmt.signalr.models.SignalRFeature]
     """
 
     _attribute_map = {
         'host_name_prefix': {'key': 'hostNamePrefix', 'type': 'str'},
+        'features': {'key': 'features', 'type': '[SignalRFeature]'},
     }
 
     def __init__(self, **kwargs):
         super(SignalRCreateOrUpdateProperties, self).__init__(**kwargs)
         self.host_name_prefix = kwargs.get('host_name_prefix', None)
+        self.features = kwargs.get('features', None)
diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rcreate_or_update_properties_py3.py b/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rcreate_or_update_properties_py3.py
index dd051d50d0af..9434ebf001e6 100644
--- a/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rcreate_or_update_properties_py3.py
+++ b/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rcreate_or_update_properties_py3.py
@@ -20,12 +20,23 @@ class SignalRCreateOrUpdateProperties(Model):
      The hostname will be of format:
      <hostNamePrefix>.service.signalr.net.
     :type host_name_prefix: str
+    :param features: List of SignalR featureFlags. e.g. ServiceMode.
+     FeatureFlags that are not included in the parameters for the update
+     operation will not be modified.
+     And the response will only include featureFlags that are explicitly set.
+     When a featureFlag is not explicitly set, SignalR service will use its
+     globally default value.
+     But keep in mind, the default value doesn't mean "false". It varies in
+     terms of different FeatureFlags.
+    :type features: list[~azure.mgmt.signalr.models.SignalRFeature]
     """
 
     _attribute_map = {
         'host_name_prefix': {'key': 'hostNamePrefix', 'type': 'str'},
+        'features': {'key': 'features', 'type': '[SignalRFeature]'},
     }
 
-    def __init__(self, *, host_name_prefix: str=None, **kwargs) -> None:
+    def __init__(self, *, host_name_prefix: str=None, features=None, **kwargs) -> None:
         super(SignalRCreateOrUpdateProperties, self).__init__(**kwargs)
         self.host_name_prefix = host_name_prefix
+        self.features = features
diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rfeature.py b/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rfeature.py
new file mode 100644
index 000000000000..da7d329e8f8e
--- /dev/null
+++ b/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rfeature.py
@@ -0,0 +1,50 @@
+# 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 SignalRFeature(Model):
+    """Feature of a SignalR resource, which controls the SignalR runtime behavior.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :ivar flag: Required. Kind of feature. Required. Default value:
+     "ServiceMode" .
+    :vartype flag: str
+    :param value: Required. Value of the feature flag. See Azure SignalR
+     service document https://docs.microsoft.com/en-us/azure/azure-signalr/ for
+     allowed values.
+    :type value: str
+    :param properties: Optional properties related to this feature.
+    :type properties: dict[str, str]
+    """
+
+    _validation = {
+        'flag': {'required': True, 'constant': True},
+        'value': {'required': True, 'max_length': 128, 'min_length': 1},
+    }
+
+    _attribute_map = {
+        'flag': {'key': 'flag', 'type': 'str'},
+        'value': {'key': 'value', 'type': 'str'},
+        'properties': {'key': 'properties', 'type': '{str}'},
+    }
+
+    flag = "ServiceMode"
+
+    def __init__(self, **kwargs):
+        super(SignalRFeature, self).__init__(**kwargs)
+        self.value = kwargs.get('value', None)
+        self.properties = kwargs.get('properties', None)
diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rfeature_py3.py b/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rfeature_py3.py
new file mode 100644
index 000000000000..52e1864e7c69
--- /dev/null
+++ b/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rfeature_py3.py
@@ -0,0 +1,50 @@
+# 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 SignalRFeature(Model):
+    """Feature of a SignalR resource, which controls the SignalR runtime behavior.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :ivar flag: Required. Kind of feature. Required. Default value:
+     "ServiceMode" .
+    :vartype flag: str
+    :param value: Required. Value of the feature flag. See Azure SignalR
+     service document https://docs.microsoft.com/en-us/azure/azure-signalr/ for
+     allowed values.
+    :type value: str
+    :param properties: Optional properties related to this feature.
+    :type properties: dict[str, str]
+    """
+
+    _validation = {
+        'flag': {'required': True, 'constant': True},
+        'value': {'required': True, 'max_length': 128, 'min_length': 1},
+    }
+
+    _attribute_map = {
+        'flag': {'key': 'flag', 'type': 'str'},
+        'value': {'key': 'value', 'type': 'str'},
+        'properties': {'key': 'properties', 'type': '{str}'},
+    }
+
+    flag = "ServiceMode"
+
+    def __init__(self, *, value: str, properties=None, **kwargs) -> None:
+        super(SignalRFeature, self).__init__(**kwargs)
+        self.value = value
+        self.properties = properties
diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rresource.py b/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rresource.py
index 8059c8a353aa..a52e7778ec7a 100644
--- a/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rresource.py
+++ b/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rresource.py
@@ -38,6 +38,15 @@ class SignalRResource(TrackedResource):
      The hostname will be of format:
      <hostNamePrefix>.service.signalr.net.
     :type host_name_prefix: str
+    :param features: List of SignalR featureFlags. e.g. ServiceMode.
+     FeatureFlags that are not included in the parameters for the update
+     operation will not be modified.
+     And the response will only include featureFlags that are explicitly set.
+     When a featureFlag is not explicitly set, SignalR service will use its
+     globally default value.
+     But keep in mind, the default value doesn't mean "false". It varies in
+     terms of different FeatureFlags.
+    :type features: list[~azure.mgmt.signalr.models.SignalRFeature]
     :ivar provisioning_state: Provisioning state of the resource. Possible
      values include: 'Unknown', 'Succeeded', 'Failed', 'Canceled', 'Running',
      'Creating', 'Updating', 'Deleting', 'Moving'
@@ -78,6 +87,7 @@ class SignalRResource(TrackedResource):
         'tags': {'key': 'tags', 'type': '{str}'},
         'sku': {'key': 'sku', 'type': 'ResourceSku'},
         'host_name_prefix': {'key': 'properties.hostNamePrefix', 'type': 'str'},
+        'features': {'key': 'properties.features', 'type': '[SignalRFeature]'},
         'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
         'external_ip': {'key': 'properties.externalIP', 'type': 'str'},
         'host_name': {'key': 'properties.hostName', 'type': 'str'},
@@ -90,6 +100,7 @@ def __init__(self, **kwargs):
         super(SignalRResource, self).__init__(**kwargs)
         self.sku = kwargs.get('sku', None)
         self.host_name_prefix = kwargs.get('host_name_prefix', None)
+        self.features = kwargs.get('features', None)
         self.provisioning_state = None
         self.external_ip = None
         self.host_name = None
diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rresource_py3.py b/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rresource_py3.py
index 4d0e9ff97977..5b838d937dd4 100644
--- a/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rresource_py3.py
+++ b/azure-mgmt-signalr/azure/mgmt/signalr/models/signal_rresource_py3.py
@@ -38,6 +38,15 @@ class SignalRResource(TrackedResource):
      The hostname will be of format:
      <hostNamePrefix>.service.signalr.net.
     :type host_name_prefix: str
+    :param features: List of SignalR featureFlags. e.g. ServiceMode.
+     FeatureFlags that are not included in the parameters for the update
+     operation will not be modified.
+     And the response will only include featureFlags that are explicitly set.
+     When a featureFlag is not explicitly set, SignalR service will use its
+     globally default value.
+     But keep in mind, the default value doesn't mean "false". It varies in
+     terms of different FeatureFlags.
+    :type features: list[~azure.mgmt.signalr.models.SignalRFeature]
     :ivar provisioning_state: Provisioning state of the resource. Possible
      values include: 'Unknown', 'Succeeded', 'Failed', 'Canceled', 'Running',
      'Creating', 'Updating', 'Deleting', 'Moving'
@@ -78,6 +87,7 @@ class SignalRResource(TrackedResource):
         'tags': {'key': 'tags', 'type': '{str}'},
         'sku': {'key': 'sku', 'type': 'ResourceSku'},
         'host_name_prefix': {'key': 'properties.hostNamePrefix', 'type': 'str'},
+        'features': {'key': 'properties.features', 'type': '[SignalRFeature]'},
         'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
         'external_ip': {'key': 'properties.externalIP', 'type': 'str'},
         'host_name': {'key': 'properties.hostName', 'type': 'str'},
@@ -86,10 +96,11 @@ class SignalRResource(TrackedResource):
         'version': {'key': 'properties.version', 'type': 'str'},
     }
 
-    def __init__(self, *, location: str=None, tags=None, sku=None, host_name_prefix: str=None, version: str=None, **kwargs) -> None:
+    def __init__(self, *, location: str=None, tags=None, sku=None, host_name_prefix: str=None, features=None, version: str=None, **kwargs) -> None:
         super(SignalRResource, self).__init__(location=location, tags=tags, **kwargs)
         self.sku = sku
         self.host_name_prefix = host_name_prefix
+        self.features = features
         self.provisioning_state = None
         self.external_ip = None
         self.host_name = None
diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/operations/operations.py b/azure-mgmt-signalr/azure/mgmt/signalr/operations/operations.py
index c51cf01a512e..a942e212ecff 100644
--- a/azure-mgmt-signalr/azure/mgmt/signalr/operations/operations.py
+++ b/azure-mgmt-signalr/azure/mgmt/signalr/operations/operations.py
@@ -23,7 +23,7 @@ class Operations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: Client Api Version. Possible values include: '2018-03-01-preview', '2018-10-01'. Constant value: "2018-10-01".
+    :ivar api_version: Client Api Version. Constant value: "2018-10-01".
     """
 
     models = models
diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/operations/signal_roperations.py b/azure-mgmt-signalr/azure/mgmt/signalr/operations/signal_roperations.py
index 738d56b752be..ebed77772a4b 100644
--- a/azure-mgmt-signalr/azure/mgmt/signalr/operations/signal_roperations.py
+++ b/azure-mgmt-signalr/azure/mgmt/signalr/operations/signal_roperations.py
@@ -25,7 +25,7 @@ class SignalROperations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: Client Api Version. Possible values include: '2018-03-01-preview', '2018-10-01'. Constant value: "2018-10-01".
+    :ivar api_version: Client Api Version. Constant value: "2018-10-01".
     """
 
     models = models
@@ -418,7 +418,7 @@ def get_long_running_output(response):
         lro_delay = operation_config.get(
             'long_running_operation_timeout',
             self.config.long_running_operation_timeout)
-        if polling is True: polling_method = ARMPolling(lro_delay, **operation_config)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **operation_config)
         elif polling is False: polling_method = NoPolling()
         else: polling_method = polling
         return LROPoller(self._client, raw_result, get_long_running_output, polling_method)
@@ -854,7 +854,7 @@ def get_long_running_output(response):
         lro_delay = operation_config.get(
             'long_running_operation_timeout',
             self.config.long_running_operation_timeout)
-        if polling is True: polling_method = ARMPolling(lro_delay, **operation_config)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **operation_config)
         elif polling is False: polling_method = NoPolling()
         else: polling_method = polling
         return LROPoller(self._client, raw_result, get_long_running_output, polling_method)
diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/operations/usages_operations.py b/azure-mgmt-signalr/azure/mgmt/signalr/operations/usages_operations.py
index bbe03a59d187..39df40d45d28 100644
--- a/azure-mgmt-signalr/azure/mgmt/signalr/operations/usages_operations.py
+++ b/azure-mgmt-signalr/azure/mgmt/signalr/operations/usages_operations.py
@@ -23,7 +23,7 @@ class UsagesOperations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: Client Api Version. Possible values include: '2018-03-01-preview', '2018-10-01'. Constant value: "2018-10-01".
+    :ivar api_version: Client Api Version. Constant value: "2018-10-01".
     """
 
     models = models
diff --git a/azure-mgmt-signalr/azure/mgmt/signalr/version.py b/azure-mgmt-signalr/azure/mgmt/signalr/version.py
index d968ebdd6e2a..e0ec669828cb 100644
--- a/azure-mgmt-signalr/azure/mgmt/signalr/version.py
+++ b/azure-mgmt-signalr/azure/mgmt/signalr/version.py
@@ -9,4 +9,5 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "0.1.2"
+VERSION = "0.1.0"
+
diff --git a/azure-mgmt-signalr/setup.py b/azure-mgmt-signalr/setup.py
index 9d0098a3cc8e..af5a171fecaa 100644
--- a/azure-mgmt-signalr/setup.py
+++ b/azure-mgmt-signalr/setup.py
@@ -53,6 +53,7 @@
     version=version,
     description='Microsoft Azure {} Client Library for Python'.format(PACKAGE_PPRINT_NAME),
     long_description=readme + '\n\n' + history,
+    long_description_content_type='text/x-rst',
     license='MIT License',
     author='Microsoft Corporation',
     author_email='azpysdkhelp@microsoft.com',