diff --git a/azure-mgmt-hanaonazure/HISTORY.rst b/azure-mgmt-hanaonazure/HISTORY.rst
index cacff9944559..35b9082e8e69 100644
--- a/azure-mgmt-hanaonazure/HISTORY.rst
+++ b/azure-mgmt-hanaonazure/HISTORY.rst
@@ -3,6 +3,12 @@
 Release History
 ===============
 
+0.1.1 (2018-05-17)
+++++++++++++++++++
+
+- Update HanaHardwareTypeNamesEnum and HanaInstanceSizeNamesEnum
+- Add os_disks to storage_profile
+
 0.1.0 (2018-01-17)
 ++++++++++++++++++
 
diff --git a/azure-mgmt-hanaonazure/azure/mgmt/hanaonazure/models/__init__.py b/azure-mgmt-hanaonazure/azure/mgmt/hanaonazure/models/__init__.py
index 39c37babf01f..97f5996fb578 100644
--- a/azure-mgmt-hanaonazure/azure/mgmt/hanaonazure/models/__init__.py
+++ b/azure-mgmt-hanaonazure/azure/mgmt/hanaonazure/models/__init__.py
@@ -11,6 +11,7 @@
 
 from .resource import Resource
 from .hardware_profile import HardwareProfile
+from .disk import Disk
 from .storage_profile import StorageProfile
 from .os_profile import OSProfile
 from .ip_address import IpAddress
@@ -29,6 +30,7 @@
 __all__ = [
     'Resource',
     'HardwareProfile',
+    'Disk',
     'StorageProfile',
     'OSProfile',
     'IpAddress',
diff --git a/azure-mgmt-hanaonazure/azure/mgmt/hanaonazure/models/disk.py b/azure-mgmt-hanaonazure/azure/mgmt/hanaonazure/models/disk.py
new file mode 100644
index 000000000000..3f532722b1c9
--- /dev/null
+++ b/azure-mgmt-hanaonazure/azure/mgmt/hanaonazure/models/disk.py
@@ -0,0 +1,46 @@
+# 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 Disk(Model):
+    """Specifies the disk information fo the HANA instance.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :param name: The disk name.
+    :type name: str
+    :param disk_size_gb: Specifies the size of an empty data disk in
+     gigabytes.
+    :type disk_size_gb: int
+    :ivar lun: Specifies the logical unit number of the data disk. This value
+     is used to identify data disks within the VM and therefore must be unique
+     for each data disk attached to a VM.
+    :vartype lun: int
+    """
+
+    _validation = {
+        'lun': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'disk_size_gb': {'key': 'diskSizeGB', 'type': 'int'},
+        'lun': {'key': 'lun', 'type': 'int'},
+    }
+
+    def __init__(self, name=None, disk_size_gb=None):
+        super(Disk, self).__init__()
+        self.name = name
+        self.disk_size_gb = disk_size_gb
+        self.lun = None
diff --git a/azure-mgmt-hanaonazure/azure/mgmt/hanaonazure/models/hana_management_client_enums.py b/azure-mgmt-hanaonazure/azure/mgmt/hanaonazure/models/hana_management_client_enums.py
index 77822b942ae9..bff5c84bf32f 100644
--- a/azure-mgmt-hanaonazure/azure/mgmt/hanaonazure/models/hana_management_client_enums.py
+++ b/azure-mgmt-hanaonazure/azure/mgmt/hanaonazure/models/hana_management_client_enums.py
@@ -15,6 +15,7 @@
 class HanaHardwareTypeNamesEnum(Enum):
 
     cisco_ucs = "Cisco_UCS"
+    hpe = "HPE"
 
 
 class HanaInstanceSizeNamesEnum(Enum):
@@ -25,3 +26,14 @@ class HanaInstanceSizeNamesEnum(Enum):
     s144 = "S144"
     s192 = "S192"
     s192m = "S192m"
+    s192xm = "S192xm"
+    s384 = "S384"
+    s384m = "S384m"
+    s384xm = "S384xm"
+    s384xxm = "S384xxm"
+    s576m = "S576m"
+    s576xm = "S576xm"
+    s768 = "S768"
+    s768m = "S768m"
+    s768xm = "S768xm"
+    s960m = "S960m"
diff --git a/azure-mgmt-hanaonazure/azure/mgmt/hanaonazure/models/hardware_profile.py b/azure-mgmt-hanaonazure/azure/mgmt/hanaonazure/models/hardware_profile.py
index fd054952ce8e..05d162766fc5 100644
--- a/azure-mgmt-hanaonazure/azure/mgmt/hanaonazure/models/hardware_profile.py
+++ b/azure-mgmt-hanaonazure/azure/mgmt/hanaonazure/models/hardware_profile.py
@@ -18,12 +18,14 @@ class HardwareProfile(Model):
     Variables are only populated by the server, and will be ignored when
     sending a request.
 
-    :ivar hardware_type: Name of the hardware type (vendor and/or thrie
-     product name). Possible values include: 'Cisco_UCS'
+    :ivar hardware_type: Name of the hardware type (vendor and/or their
+     product name). Possible values include: 'Cisco_UCS', 'HPE'
     :vartype hardware_type: str or
      ~azure.mgmt.hanaonazure.models.HanaHardwareTypeNamesEnum
     :ivar hana_instance_size: Specifies the HANA instance SKU. Possible values
-     include: 'S72m', 'S144m', 'S72', 'S144', 'S192', 'S192m'
+     include: 'S72m', 'S144m', 'S72', 'S144', 'S192', 'S192m', 'S192xm',
+     'S384', 'S384m', 'S384xm', 'S384xxm', 'S576m', 'S576xm', 'S768', 'S768m',
+     'S768xm', 'S960m'
     :vartype hana_instance_size: str or
      ~azure.mgmt.hanaonazure.models.HanaInstanceSizeNamesEnum
     """
diff --git a/azure-mgmt-hanaonazure/azure/mgmt/hanaonazure/models/ip_address.py b/azure-mgmt-hanaonazure/azure/mgmt/hanaonazure/models/ip_address.py
index e7ceb00f45da..a69655326ef0 100644
--- a/azure-mgmt-hanaonazure/azure/mgmt/hanaonazure/models/ip_address.py
+++ b/azure-mgmt-hanaonazure/azure/mgmt/hanaonazure/models/ip_address.py
@@ -13,7 +13,7 @@
 
 
 class IpAddress(Model):
-    """IpAddress.
+    """Specifies the IP address of the network interaface.
 
     Variables are only populated by the server, and will be ignored when
     sending a request.
diff --git a/azure-mgmt-hanaonazure/azure/mgmt/hanaonazure/models/storage_profile.py b/azure-mgmt-hanaonazure/azure/mgmt/hanaonazure/models/storage_profile.py
index 39c5af5cf44c..037455f5b716 100644
--- a/azure-mgmt-hanaonazure/azure/mgmt/hanaonazure/models/storage_profile.py
+++ b/azure-mgmt-hanaonazure/azure/mgmt/hanaonazure/models/storage_profile.py
@@ -20,6 +20,9 @@ class StorageProfile(Model):
 
     :ivar nfs_ip_address: IP Address to connect to storage.
     :vartype nfs_ip_address: str
+    :param os_disks: Specifies information about the operating system disk
+     used by the hana instance.
+    :type os_disks: list[~azure.mgmt.hanaonazure.models.Disk]
     """
 
     _validation = {
@@ -28,8 +31,10 @@ class StorageProfile(Model):
 
     _attribute_map = {
         'nfs_ip_address': {'key': 'nfsIpAddress', 'type': 'str'},
+        'os_disks': {'key': 'osDisks', 'type': '[Disk]'},
     }
 
-    def __init__(self):
+    def __init__(self, os_disks=None):
         super(StorageProfile, self).__init__()
         self.nfs_ip_address = None
+        self.os_disks = os_disks
diff --git a/azure-mgmt-hanaonazure/azure/mgmt/hanaonazure/operations/hana_instances_operations.py b/azure-mgmt-hanaonazure/azure/mgmt/hanaonazure/operations/hana_instances_operations.py
index 665ea69520ec..90b217293975 100644
--- a/azure-mgmt-hanaonazure/azure/mgmt/hanaonazure/operations/hana_instances_operations.py
+++ b/azure-mgmt-hanaonazure/azure/mgmt/hanaonazure/operations/hana_instances_operations.py
@@ -21,7 +21,7 @@ class HanaInstancesOperations(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: "2017-11-03-preview".
     """
 
@@ -59,7 +59,7 @@ def internal_paging(next_link=None, raw=False):
 
             if not next_link:
                 # Construct URL
-                url = '/subscriptions/{subscriptionId}/providers/Microsoft.HanaOnAzure/hanaInstances'
+                url = self.list.metadata['url']
                 path_format_arguments = {
                     'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
                 }
@@ -102,6 +102,7 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
+    list.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.HanaOnAzure/hanaInstances'}
 
     def list_by_resource_group(
             self, resource_group_name, custom_headers=None, raw=False, **operation_config):
@@ -129,7 +130,7 @@ def internal_paging(next_link=None, raw=False):
 
             if not next_link:
                 # Construct URL
-                url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HanaOnAzure/hanaInstances'
+                url = self.list_by_resource_group.metadata['url']
                 path_format_arguments = {
                     'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
                     'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str')
@@ -173,6 +174,7 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
+    list_by_resource_group.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HanaOnAzure/hanaInstances'}
 
     def get(
             self, resource_group_name, hana_instance_name, custom_headers=None, raw=False, **operation_config):
@@ -197,7 +199,7 @@ def get(
          :class:`ErrorResponseException<azure.mgmt.hanaonazure.models.ErrorResponseException>`
         """
         # Construct URL
-        url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HanaOnAzure/hanaInstances/{hanaInstanceName}'
+        url = self.get.metadata['url']
         path_format_arguments = {
             'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
             'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
@@ -236,3 +238,4 @@ def get(
             return client_raw_response
 
         return deserialized
+    get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.HanaOnAzure/hanaInstances/{hanaInstanceName}'}
diff --git a/azure-mgmt-hanaonazure/azure/mgmt/hanaonazure/operations/operations.py b/azure-mgmt-hanaonazure/azure/mgmt/hanaonazure/operations/operations.py
index 5860b9a43e28..3d9de7845b23 100644
--- a/azure-mgmt-hanaonazure/azure/mgmt/hanaonazure/operations/operations.py
+++ b/azure-mgmt-hanaonazure/azure/mgmt/hanaonazure/operations/operations.py
@@ -21,7 +21,7 @@ class Operations(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: "2017-11-03-preview".
     """
 
@@ -55,7 +55,7 @@ def internal_paging(next_link=None, raw=False):
 
             if not next_link:
                 # Construct URL
-                url = '/providers/Microsoft.HanaOnAzure/operations'
+                url = self.list.metadata['url']
 
                 # Construct parameters
                 query_parameters = {}
@@ -94,3 +94,4 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
+    list.metadata = {'url': '/providers/Microsoft.HanaOnAzure/operations'}
diff --git a/azure-mgmt-hanaonazure/azure/mgmt/hanaonazure/version.py b/azure-mgmt-hanaonazure/azure/mgmt/hanaonazure/version.py
index e0ec669828cb..e7efe25ea7e0 100644
--- a/azure-mgmt-hanaonazure/azure/mgmt/hanaonazure/version.py
+++ b/azure-mgmt-hanaonazure/azure/mgmt/hanaonazure/version.py
@@ -9,5 +9,5 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "0.1.0"
+VERSION = "0.1.1"