diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/MountTargets_Delete.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/MountTargets_Delete.json
deleted file mode 100644
index 5ba8004905e4..000000000000
--- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/MountTargets_Delete.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "parameters": {
-    "subscriptionId": "subscriptionId",
-    "resourceGroup": "resourceGroup",
-    "accountName": "accountName",
-    "poolName": "poolName",
-    "volumeName": "volumeName",
-    "mountTargetName": "mountTargetName",
-    "api-version": "2017-08-15"
-  },
-  "responses": {
-    "204": {},
-    "202": {}
-  }
-}
diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_CreateOrUpdate.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_CreateOrUpdate.json
index c3b0ff61a100..8674438c325e 100644
--- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_CreateOrUpdate.json
+++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_CreateOrUpdate.json
@@ -16,10 +16,10 @@
           "provisioningState": "Created",
           "poolId": "9760acf5-4638-11e7-9bdb-020073ca7778",
           "serviceLevel": "Premium",
-          "size": 12345
+          "size": 4398046511104
         }
       }
-    }, 
+    },
     "202": {}
   }
 }
diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_Get.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_Get.json
index 326433caa272..39ba8ffaa1c8 100644
--- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_Get.json
+++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_Get.json
@@ -15,7 +15,7 @@
           "provisioningState": "Created",
           "poolId": "9760acf5-4638-11e7-9bdb-020073ca7778",
           "serviceLevel": "Premium",
-          "size": 12345
+          "size": 4398046511104
         }
       }
     }
diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_List.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_List.json
index e4dbb0624a0a..ddc46ca7bd61 100644
--- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_List.json
+++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_List.json
@@ -16,7 +16,7 @@
               "provisioningState": "Created",
               "poolId": "9760acf5-4638-11e7-9bdb-020073ca7778",
               "serviceLevel": "Premium",
-              "size": 12345
+              "size": 4398046511104
             }
           }
         ]
diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_Update.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_Update.json
index 2dfb6f0d7166..6faa8404ec8d 100644
--- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_Update.json
+++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_Update.json
@@ -16,7 +16,7 @@
           "provisioningState": "Created",
           "poolId": "9760acf5-4638-11e7-9bdb-020073ca7778",
           "serviceLevel": "Premium",
-          "size": 12345
+          "size": 4398046511104
         }
       }
     }
diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Snapshots_Create.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Snapshots_Create.json
new file mode 100644
index 000000000000..bcd7b8bcfafe
--- /dev/null
+++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Snapshots_Create.json
@@ -0,0 +1,27 @@
+{
+  "parameters": {
+    "subscriptionId": "subscriptionId",
+    "resourceGroup": "resourceGroup",
+    "accountName": "accountName",
+    "poolName": "poolName",
+    "volumeName": "volumeName",
+    "snapshotName": "snapshotName",
+    "api-version": "2017-08-15",
+    "body": {}
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "location": "eastus",
+        "properties": {
+          "snapshotId": "9760acf5-4638-11e7-9bdb-020073ca3333",
+          "fileSystemId": "9760acf5-4638-11e7-9bdb-020073ca3333",
+          "creationDate": "2017-08-15T13:23:33Z",
+          "name": "snapshot1",
+          "provisioningState": "Created"
+        }
+      }
+    },
+    "202": {}
+  }
+}
diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Snapshots_Update.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Snapshots_Update.json
new file mode 100644
index 000000000000..fb3c11191136
--- /dev/null
+++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Snapshots_Update.json
@@ -0,0 +1,26 @@
+{
+  "parameters": {
+    "subscriptionId": "subscriptionId",
+    "resourceGroup": "resourceGroup",
+    "accountName": "accountName",
+    "poolName": "poolName",
+    "volumeName": "volumeName",
+    "snapshotName": "snapshotName",
+    "api-version": "2017-08-15",
+    "body": {}
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "location": "eastus",
+        "properties": {
+          "snapshotId": "9760acf5-4638-11e7-9bdb-020073ca3333",
+          "fileSystemId": "9760acf5-4638-11e7-9bdb-020073ca3333",
+          "creationDate": "2017-08-15T13:23:33Z",
+          "name": "snapshot1",
+          "provisioningState": "Created"
+        }
+      }
+    }
+  }
+}
diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_CreateOrUpdate.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_CreateOrUpdate.json
index fd4a9a31e044..91f5cfbba280 100644
--- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_CreateOrUpdate.json
+++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_CreateOrUpdate.json
@@ -16,10 +16,10 @@
           "fileSystemId": "9760acf5-4638-11e7-9bdb-020073ca7778",
           "name": "myvolume",
           "creationToken": "some-amazing-filepath",
-          "usageThreshold": 101010,
+          "usageThreshold": 107374182400,
           "serviceLevel": "Premium",
           "provisioningState": "Created",
-          "subnetId": "/subscriptions/9760acf5-4638-11e7-9bdb-020073ca7778/resourceGroup/myRP/providers/Microsoft.Network/virtualNetworks/testvnet3/subnets/testsubnet3"
+          "subnetId": "/subscriptions/9760acf5-4638-11e7-9bdb-020073ca7778/resourceGroups/myRP/providers/Microsoft.Network/virtualNetworks/testvnet3/subnets/testsubnet3"
         }
       }
     },
diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_Get.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_Get.json
index db4770e998c4..31a895158193 100644
--- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_Get.json
+++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_Get.json
@@ -15,10 +15,10 @@
           "fileSystemId": "9760acf5-4638-11e7-9bdb-020073ca7778",
           "name": "myvolume",
           "creationToken": "some-amazing-filepath",
-          "usageThreshold": 101010,
+          "usageThreshold": 107374182400,
           "serviceLevel": "Premium",
           "provisioningState": "Created",
-          "subnetId": "/subscriptions/9760acf5-4638-11e7-9bdb-020073ca7778/resourceGroup/myRP/providers/Microsoft.Network/virtualNetworks/testvnet3/subnets/testsubnet3"
+          "subnetId": "/subscriptions/9760acf5-4638-11e7-9bdb-020073ca7778/resourceGroups/myRP/providers/Microsoft.Network/virtualNetworks/testvnet3/subnets/testsubnet3"
         }
       }
     }
diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_List.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_List.json
index 73b7c041619e..a532627e9f5e 100644
--- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_List.json
+++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_List.json
@@ -16,10 +16,10 @@
               "fileSystemId": "9760acf5-4638-11e7-9bdb-020073ca7778",
               "name": "myvolume",
               "creationToken": "some-amazing-filepath",
-              "usageThreshold": 101010,
+              "usageThreshold": 107374182400,
               "serviceLevel": "Premium",
               "provisioningState": "Created",
-              "subnetId": "/subscriptions/9760acf5-4638-11e7-9bdb-020073ca7778/resourceGroup/myRP/providers/Microsoft.Network/virtualNetworks/testvnet3/subnets/testsubnet3"
+              "subnetId": "/subscriptions/9760acf5-4638-11e7-9bdb-020073ca7778/resourceGroups/myRP/providers/Microsoft.Network/virtualNetworks/testvnet3/subnets/testsubnet3"
             }
           }
         ]
diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_Update.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_Update.json
index 43e41f274568..f0938be3e993 100644
--- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_Update.json
+++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_Update.json
@@ -16,7 +16,7 @@
           "fileSystemId": "9760acf5-4638-11e7-9bdb-020073ca7778",
           "name": "myvolume",
           "creationToken": "some-amazing-filepath",
-          "usageThreshold": 101010,
+          "usageThreshold": 107374182400,
           "serviceLevel": "Premium",
           "provisioningState": "Created"
         }
diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/netapp.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/netapp.json
index 103a2b754cf7..4d7c7bf1df22 100644
--- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/netapp.json
+++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/netapp.json
@@ -49,6 +49,9 @@
             "$ref": "#/parameters/ApiVersionParameter"
           }
         ],
+        "x-ms-pageable": {
+          "nextLinkName": null
+        },
         "responses": {
           "200": {
             "description": "OK",
@@ -65,7 +68,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourceGroup/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts": {
       "parameters": [
         {
           "$ref": "#/parameters/SubscriptionId"
@@ -83,6 +86,9 @@
           "NetApp Accounts"
         ],
         "operationId": "Accounts_List",
+        "x-ms-pageable": {
+          "nextLinkName": null
+        },
         "responses": {
           "200": {
             "description": "OK",
@@ -104,7 +110,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourceGroup/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}": {
       "parameters": [
         {
           "$ref": "#/parameters/SubscriptionId"
@@ -251,7 +257,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourceGroup/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/pools": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/pools": {
       "parameters": [
         {
           "$ref": "#/parameters/SubscriptionId"
@@ -272,6 +278,9 @@
           "Capacity Pools"
         ],
         "operationId": "Pools_List",
+        "x-ms-pageable": {
+          "nextLinkName": null
+        },
         "responses": {
           "200": {
             "description": "OK",
@@ -293,7 +302,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourceGroup/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/pools/{poolName}": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/pools/{poolName}": {
       "parameters": [
         {
           "$ref": "#/parameters/SubscriptionId"
@@ -467,6 +476,9 @@
           "Volumes"
         ],
         "operationId": "Volumes_List",
+        "x-ms-pageable": {
+          "nextLinkName": null
+        },
         "responses": {
           "200": {
             "description": "OK",
@@ -668,6 +680,9 @@
         ],
         "operationId": "MountTargets_List",
         "description": "List mount targets",
+        "x-ms-pageable": {
+          "nextLinkName": null
+        },
         "responses": {
           "200": {
             "description": "OK",
@@ -738,33 +753,6 @@
             "$ref": "examples/MountTargets_Get.json"
           }
         }
-      },
-      "delete": {
-        "tags": [
-          "MountTargets"
-        ],
-        "operationId": "MountTargets_Delete",
-        "description": "Delete mount target",
-        "responses": {
-          "202": {
-            "description": "Accepted -- Create or update request accepted; operation will complete asynchronously"
-          },
-          "204": {
-            "description": "NoContent -- Resource does not exist."
-          },
-          "default": {
-            "description": "Error response describing why the operation failed.",
-            "schema": {
-              "$ref": "#/definitions/error"
-            }
-          }
-        },
-        "x-ms-long-running-operation": true,
-        "x-ms-examples": {
-          "MountTargets_Delete": {
-            "$ref": "examples/MountTargets_Delete.json"
-          }
-        }
       }
     },
     "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/pools/{poolName}/volumes/{volumeName}/snapshots": {
@@ -794,6 +782,9 @@
         ],
         "operationId": "Snapshots_List",
         "description": "List snapshots",
+        "x-ms-pageable": {
+          "nextLinkName": null
+        },
         "responses": {
           "200": {
             "description": "OK",
@@ -865,6 +856,84 @@
           }
         }
       },
+      "put": {
+        "tags": [
+          "Snapshots"
+        ],
+        "operationId": "Snapshots_Create",
+        "description": "Create a snapshot",
+        "parameters": [
+          {
+            "name": "body",
+            "description": "Snapshot object supplied in the body of the operation.",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/snapshot"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Snapshot created",
+            "schema": {
+              "$ref": "#/definitions/snapshot"
+            }
+          },
+          "202": {
+            "description": "Accepted -- Create request accepted; operation will complete asynchronously"
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/error"
+            }
+          }
+        },
+        "x-ms-long-running-operation": true,
+        "x-ms-examples": {
+          "Snapshots_Create": {
+            "$ref": "examples/Snapshots_Create.json"
+          }
+        }
+      },
+      "patch": {
+        "tags": [
+          "Snapshots"
+        ],
+        "operationId": "Snapshots_Update",
+        "description": "Patch a snapshot",
+        "parameters": [
+          {
+            "name": "body",
+            "description": "Snapshot object supplied in the body of the operation.",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/snapshotPatch"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "schema": {
+              "$ref": "#/definitions/snapshot"
+            }
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/error"
+            }
+          }
+        },
+        "x-ms-examples": {
+          "Snapshots_Update": {
+            "$ref": "examples/Snapshots_Update.json"
+          }
+        }
+      },
       "delete": {
         "tags": [
           "Snapshots"
@@ -1209,27 +1278,24 @@
         "size": {
           "title": "size",
           "type": "integer",
-          "description": "Provisioned size of the pool (in GB)",
-          "minimum": 4096,
-          "default": 4096
+          "description": "Provisioned size of the pool (in bytes). Allowed values are in 4TiB chunks (value must be multiply of 4398046511104).",
+          "minimum": 4398046511104,
+          "maximum": 549755813888000,
+          "default": 4398046511104
         },
         "serviceLevel": {
           "title": "serviceLevel",
           "type": "string",
           "description": "The service level of the file system",
           "enum": [
-            "Basic",
             "Standard",
-            "Premium"
+            "Premium",
+            "Extreme"
           ],
           "x-ms-enum": {
             "name": "ServiceLevel",
             "modelAsString": true,
             "values": [
-              {
-                "value": "Basic",
-                "description": "Basic service level"
-              },
               {
                 "value": "Standard",
                 "description": "Standard service level"
@@ -1237,11 +1303,15 @@
               {
                 "value": "Premium",
                 "description": "Premium service level"
+              },
+              {
+                "value": "Extreme",
+                "description": "Extreme service level"
               }
             ]
           },
-          "example": "Premium",
-          "default": "Standard"
+          "example": "Extreme",
+          "default": "Premium"
         },
         "provisioningState": {
           "type": "string",
@@ -1347,18 +1417,14 @@
           "type": "string",
           "description": "The service level of the file system",
           "enum": [
-            "Basic",
             "Standard",
-            "Premium"
+            "Premium",
+            "Extreme"
           ],
           "x-ms-enum": {
             "name": "ServiceLevel",
             "modelAsString": true,
             "values": [
-              {
-                "value": "Basic",
-                "description": "Basic service level"
-              },
               {
                 "value": "Standard",
                 "description": "Standard service level"
@@ -1366,21 +1432,25 @@
               {
                 "value": "Premium",
                 "description": "Premium service level"
+              },
+              {
+                "value": "Extreme",
+                "description": "Extreme service level"
               }
             ]
           },
-          "example": "Premium",
-          "default": "Standard"
+          "example": "Extreme",
+          "default": "Premium"
         },
         "usageThreshold": {
           "title": "usageThreshold",
           "type": "integer",
           "format": "int64",
-          "description": "Maximum storage quota allowed for a file system in bytes. This is a soft quota used for alerting only. Upper limit is 100TB.",
-          "minimum": 0,
+          "description": "Maximum storage quota allowed for a file system in bytes. This is a soft quota used for alerting only. Minimum size is 100 GiB. Upper limit is 100TiB.",
+          "minimum": 107374182400,
           "maximum": 109951162777600,
-          "default": 0,
-          "example": 101010
+          "default": 107374182400,
+          "example": 107374182400
         },
         "provisioningState": {
           "type": "string",
@@ -1443,18 +1513,14 @@
           "type": "string",
           "description": "The service level of the file system",
           "enum": [
-            "Basic",
             "Standard",
-            "Premium"
+            "Premium",
+            "Extreme"
           ],
           "x-ms-enum": {
             "name": "ServiceLevel",
             "modelAsString": true,
             "values": [
-              {
-                "value": "Basic",
-                "description": "Basic service level"
-              },
               {
                 "value": "Standard",
                 "description": "Standard service level"
@@ -1462,21 +1528,25 @@
               {
                 "value": "Premium",
                 "description": "Premium service level"
+              },
+              {
+                "value": "Extreme",
+                "description": "Extreme service level"
               }
             ]
           },
-          "example": "Premium",
-          "default": "Standard"
+          "example": "Extreme",
+          "default": "Premium"
         },
         "usageThreshold": {
           "title": "usageThreshold",
           "type": "integer",
           "format": "int64",
-          "description": "Maximum storage quota allowed for a file system in bytes. This is a soft quota used for alerting only. Upper limit is 100TB.",
-          "minimum": 0,
+          "description": "Maximum storage quota allowed for a file system in bytes. This is a soft quota used for alerting only. Minimum size is 100 GiB. Upper limit is 100TiB.",
+          "minimum": 107374182400,
           "maximum": 109951162777600,
-          "default": 0,
-          "example": 101010
+          "default": 107374182400,
+          "example": 107374182400
         }
       }
     },
@@ -1620,6 +1690,7 @@
     "snapshot": {
       "description": "Snapshot of a Volume",
       "type": "object",
+      "x-ms-azure-resource": true,
       "required": [
         "location",
         "properties"
@@ -1627,7 +1698,11 @@
       "properties": {
         "location": {
           "type": "string",
-          "description": "Resource location"
+          "description": "Resource location",
+          "x-ms-mutability": [
+            "read",
+            "create"
+          ]
         },
         "id": {
           "type": "string",
@@ -1639,6 +1714,11 @@
           "readOnly": true,
           "description": "Resource name"
         },
+        "type": {
+          "type": "string",
+          "readOnly": true,
+          "description": "Resource type"
+        },
         "tags": {
           "description": "Resource tags",
           "$ref": "#/definitions/resourceTags",
@@ -1651,6 +1731,18 @@
         }
       }
     },
+    "snapshotPatch": {
+      "description": "Snapshot patch",
+      "type": "object",
+      "x-ms-azure-resource": true,
+      "properties": {
+        "tags": {
+          "description": "Resource tags",
+          "$ref": "#/definitions/resourceTags",
+          "x-ms-client-flatten": true
+        }
+      }
+    },
     "snapshotProperties": {
       "description": "Snapshot properties",
       "type": "object",