diff --git a/codegen_mappings.json b/codegen_mappings.json
index 45a289f0e3..0a4e69097d 100644
--- a/codegen_mappings.json
+++ b/codegen_mappings.json
@@ -637,6 +637,9 @@
   "servicebus": {
     "resource-manager": {
       "packageName": "azure-arm-sb",
+      "packageVersion": "2.2.0-preview",
+      "generateLicenseTxt": true,
+      "generatePackageJson": true,
       "dir": "serviceBusManagement2",
       "source": "servicebus/resource-manager/readme.md"
     }
diff --git a/lib/services/serviceBusManagement2/LICENSE.txt b/lib/services/serviceBusManagement2/LICENSE.txt
index 0313a903d7..a70e8cf660 100644
--- a/lib/services/serviceBusManagement2/LICENSE.txt
+++ b/lib/services/serviceBusManagement2/LICENSE.txt
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2017 Microsoft
+Copyright (c) 2018 Microsoft
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
\ No newline at end of file
+SOFTWARE.
diff --git a/lib/services/serviceBusManagement2/lib/models/correlationFilter.js b/lib/services/serviceBusManagement2/lib/models/correlationFilter.js
index 1d6ea5b38f..bee515f0d9 100644
--- a/lib/services/serviceBusManagement2/lib/models/correlationFilter.js
+++ b/lib/services/serviceBusManagement2/lib/models/correlationFilter.js
@@ -17,6 +17,7 @@
 class CorrelationFilter {
   /**
    * Create a CorrelationFilter.
+   * @member {object} [properties] dictionary object for custom filters
    * @member {string} [correlationId] Identifier of the correlation.
    * @member {string} [messageId] Identifier of the message.
    * @member {string} [to] Address to send to.
@@ -45,6 +46,20 @@ class CorrelationFilter {
         name: 'Composite',
         className: 'CorrelationFilter',
         modelProperties: {
+          properties: {
+            required: false,
+            serializedName: 'properties',
+            type: {
+              name: 'Dictionary',
+              value: {
+                  required: false,
+                  serializedName: 'StringElementType',
+                  type: {
+                    name: 'String'
+                  }
+              }
+            }
+          },
           correlationId: {
             required: false,
             serializedName: 'correlationId',
diff --git a/lib/services/serviceBusManagement2/lib/models/index.d.ts b/lib/services/serviceBusManagement2/lib/models/index.d.ts
index 1d48378c47..6a7412272f 100644
--- a/lib/services/serviceBusManagement2/lib/models/index.d.ts
+++ b/lib/services/serviceBusManagement2/lib/models/index.d.ts
@@ -282,6 +282,8 @@ export interface MessageCountDetails {
  * messaging entity. Possible values include: 'Active', 'Disabled',
  * 'Restoring', 'SendDisabled', 'ReceiveDisabled', 'Creating', 'Deleting',
  * 'Renaming', 'Unknown'
+ * @member {boolean} [enableBatchedOperations] Value that indicates whether
+ * server-side batched operations are enabled.
  * @member {moment.duration} [autoDeleteOnIdle] ISO 8061 timeSpan idle interval
  * after which the queue is automatically deleted. The minimum duration is 5
  * minutes.
@@ -310,6 +312,7 @@ export interface SBQueue extends Resource {
   duplicateDetectionHistoryTimeWindow?: moment.Duration;
   maxDeliveryCount?: number;
   status?: string;
+  enableBatchedOperations?: boolean;
   autoDeleteOnIdle?: moment.Duration;
   enablePartitioning?: boolean;
   enableExpress?: boolean;
@@ -592,6 +595,7 @@ export interface SqlFilter {
  * @constructor
  * Represents the correlation filter expression.
  *
+ * @member {object} [properties] dictionary object for custom filters
  * @member {string} [correlationId] Identifier of the correlation.
  * @member {string} [messageId] Identifier of the message.
  * @member {string} [to] Address to send to.
@@ -604,6 +608,7 @@ export interface SqlFilter {
  * rule action requires preprocessing. Default value: true .
  */
 export interface CorrelationFilter {
+  properties?: { [propertyName: string]: string };
   correlationId?: string;
   messageId?: string;
   to?: string;
@@ -642,6 +647,8 @@ export interface CorrelationFilter {
  * @member {boolean} [sqlFilter.requiresPreprocessing] Value that indicates
  * whether the rule action requires preprocessing.
  * @member {object} [correlationFilter] Properties of correlationFilter
+ * @member {object} [correlationFilter.properties] dictionary object for custom
+ * filters
  * @member {string} [correlationFilter.correlationId] Identifier of the
  * correlation.
  * @member {string} [correlationFilter.messageId] Identifier of the message.
diff --git a/lib/services/serviceBusManagement2/lib/models/rule.js b/lib/services/serviceBusManagement2/lib/models/rule.js
index 53ec44e2b1..119a83310b 100644
--- a/lib/services/serviceBusManagement2/lib/models/rule.js
+++ b/lib/services/serviceBusManagement2/lib/models/rule.js
@@ -41,6 +41,8 @@ class Rule extends models['Resource'] {
    * @member {boolean} [sqlFilter.requiresPreprocessing] Value that indicates
    * whether the rule action requires preprocessing.
    * @member {object} [correlationFilter] Properties of correlationFilter
+   * @member {object} [correlationFilter.properties] dictionary object for
+   * custom filters
    * @member {string} [correlationFilter.correlationId] Identifier of the
    * correlation.
    * @member {string} [correlationFilter.messageId] Identifier of the message.
diff --git a/lib/services/serviceBusManagement2/lib/models/sBQueue.js b/lib/services/serviceBusManagement2/lib/models/sBQueue.js
index 949c88011c..0d903b1054 100644
--- a/lib/services/serviceBusManagement2/lib/models/sBQueue.js
+++ b/lib/services/serviceBusManagement2/lib/models/sBQueue.js
@@ -66,6 +66,8 @@ class SBQueue extends models['Resource'] {
    * a messaging entity. Possible values include: 'Active', 'Disabled',
    * 'Restoring', 'SendDisabled', 'ReceiveDisabled', 'Creating', 'Deleting',
    * 'Renaming', 'Unknown'
+   * @member {boolean} [enableBatchedOperations] Value that indicates whether
+   * server-side batched operations are enabled.
    * @member {moment.duration} [autoDeleteOnIdle] ISO 8061 timeSpan idle
    * interval after which the queue is automatically deleted. The minimum
    * duration is 5 minutes.
@@ -233,6 +235,13 @@ class SBQueue extends models['Resource'] {
               allowedValues: [ 'Active', 'Disabled', 'Restoring', 'SendDisabled', 'ReceiveDisabled', 'Creating', 'Deleting', 'Renaming', 'Unknown' ]
             }
           },
+          enableBatchedOperations: {
+            required: false,
+            serializedName: 'properties.enableBatchedOperations',
+            type: {
+              name: 'Boolean'
+            }
+          },
           autoDeleteOnIdle: {
             required: false,
             serializedName: 'properties.autoDeleteOnIdle',
diff --git a/lib/services/serviceBusManagement2/lib/operations/index.d.ts b/lib/services/serviceBusManagement2/lib/operations/index.d.ts
index 9623012898..b4f4ca57b7 100644
--- a/lib/services/serviceBusManagement2/lib/operations/index.d.ts
+++ b/lib/services/serviceBusManagement2/lib/operations/index.d.ts
@@ -2323,6 +2323,9 @@ export interface Queues {
      * 'Restoring', 'SendDisabled', 'ReceiveDisabled', 'Creating', 'Deleting',
      * 'Renaming', 'Unknown'
      *
+     * @param {boolean} [parameters.enableBatchedOperations] Value that indicates
+     * whether server-side batched operations are enabled.
+     *
      * @param {moment.duration} [parameters.autoDeleteOnIdle] ISO 8061 timeSpan
      * idle interval after which the queue is automatically deleted. The minimum
      * duration is 5 minutes.
@@ -2402,6 +2405,9 @@ export interface Queues {
      * 'Restoring', 'SendDisabled', 'ReceiveDisabled', 'Creating', 'Deleting',
      * 'Renaming', 'Unknown'
      *
+     * @param {boolean} [parameters.enableBatchedOperations] Value that indicates
+     * whether server-side batched operations are enabled.
+     *
      * @param {moment.duration} [parameters.autoDeleteOnIdle] ISO 8061 timeSpan
      * idle interval after which the queue is automatically deleted. The minimum
      * duration is 5 minutes.
@@ -4582,6 +4588,9 @@ export interface Rules {
      * @param {object} [parameters.correlationFilter] Properties of
      * correlationFilter
      *
+     * @param {object} [parameters.correlationFilter.properties] dictionary object
+     * for custom filters
+     *
      * @param {string} [parameters.correlationFilter.correlationId] Identifier of
      * the correlation.
      *
@@ -4665,6 +4674,9 @@ export interface Rules {
      * @param {object} [parameters.correlationFilter] Properties of
      * correlationFilter
      *
+     * @param {object} [parameters.correlationFilter.properties] dictionary object
+     * for custom filters
+     *
      * @param {string} [parameters.correlationFilter.correlationId] Identifier of
      * the correlation.
      *
diff --git a/lib/services/serviceBusManagement2/lib/operations/queues.js b/lib/services/serviceBusManagement2/lib/operations/queues.js
index 2e37fa30b6..1578d3f68b 100644
--- a/lib/services/serviceBusManagement2/lib/operations/queues.js
+++ b/lib/services/serviceBusManagement2/lib/operations/queues.js
@@ -231,6 +231,9 @@ function _listByNamespace(resourceGroupName, namespaceName, options, callback) {
  * 'Restoring', 'SendDisabled', 'ReceiveDisabled', 'Creating', 'Deleting',
  * 'Renaming', 'Unknown'
  *
+ * @param {boolean} [parameters.enableBatchedOperations] Value that indicates
+ * whether server-side batched operations are enabled.
+ *
  * @param {moment.duration} [parameters.autoDeleteOnIdle] ISO 8061 timeSpan
  * idle interval after which the queue is automatically deleted. The minimum
  * duration is 5 minutes.
@@ -2374,6 +2377,9 @@ class Queues {
    * 'Restoring', 'SendDisabled', 'ReceiveDisabled', 'Creating', 'Deleting',
    * 'Renaming', 'Unknown'
    *
+   * @param {boolean} [parameters.enableBatchedOperations] Value that indicates
+   * whether server-side batched operations are enabled.
+   *
    * @param {moment.duration} [parameters.autoDeleteOnIdle] ISO 8061 timeSpan
    * idle interval after which the queue is automatically deleted. The minimum
    * duration is 5 minutes.
@@ -2465,6 +2471,9 @@ class Queues {
    * 'Restoring', 'SendDisabled', 'ReceiveDisabled', 'Creating', 'Deleting',
    * 'Renaming', 'Unknown'
    *
+   * @param {boolean} [parameters.enableBatchedOperations] Value that indicates
+   * whether server-side batched operations are enabled.
+   *
    * @param {moment.duration} [parameters.autoDeleteOnIdle] ISO 8061 timeSpan
    * idle interval after which the queue is automatically deleted. The minimum
    * duration is 5 minutes.
diff --git a/lib/services/serviceBusManagement2/lib/operations/rules.js b/lib/services/serviceBusManagement2/lib/operations/rules.js
index 37a3eac0f7..56fb43b4f2 100644
--- a/lib/services/serviceBusManagement2/lib/operations/rules.js
+++ b/lib/services/serviceBusManagement2/lib/operations/rules.js
@@ -254,6 +254,9 @@ function _listBySubscriptions(resourceGroupName, namespaceName, topicName, subsc
  * @param {object} [parameters.correlationFilter] Properties of
  * correlationFilter
  *
+ * @param {object} [parameters.correlationFilter.properties] dictionary object
+ * for custom filters
+ *
  * @param {string} [parameters.correlationFilter.correlationId] Identifier of
  * the correlation.
  *
@@ -1181,6 +1184,9 @@ class Rules {
    * @param {object} [parameters.correlationFilter] Properties of
    * correlationFilter
    *
+   * @param {object} [parameters.correlationFilter.properties] dictionary object
+   * for custom filters
+   *
    * @param {string} [parameters.correlationFilter.correlationId] Identifier of
    * the correlation.
    *
@@ -1276,6 +1282,9 @@ class Rules {
    * @param {object} [parameters.correlationFilter] Properties of
    * correlationFilter
    *
+   * @param {object} [parameters.correlationFilter.properties] dictionary object
+   * for custom filters
+   *
    * @param {string} [parameters.correlationFilter.correlationId] Identifier of
    * the correlation.
    *
diff --git a/lib/services/serviceBusManagement2/lib/serviceBusManagementClient.d.ts b/lib/services/serviceBusManagement2/lib/serviceBusManagementClient.d.ts
index f02428ba8d..2cec427818 100644
--- a/lib/services/serviceBusManagement2/lib/serviceBusManagementClient.d.ts
+++ b/lib/services/serviceBusManagement2/lib/serviceBusManagementClient.d.ts
@@ -10,9 +10,10 @@
 
 import { ServiceClientCredentials } from 'ms-rest';
 import { AzureServiceClient, AzureServiceClientOptions } from 'ms-rest-azure';
+import * as models from "./models";
 import * as operations from "./operations";
 
-declare class ServiceBusManagementClient extends AzureServiceClient {
+export default class ServiceBusManagementClient extends AzureServiceClient {
   /**
    * Initializes a new instance of the ServiceBusManagementClient class.
    * @constructor
@@ -67,4 +68,4 @@ declare class ServiceBusManagementClient extends AzureServiceClient {
   eventHubs: operations.EventHubs;
 }
 
-export = ServiceBusManagementClient;
+export { ServiceBusManagementClient, models as ServiceBusManagementModels };
diff --git a/lib/services/serviceBusManagement2/lib/serviceBusManagementClient.js b/lib/services/serviceBusManagement2/lib/serviceBusManagementClient.js
index fdd395a243..e4d0ec81f4 100644
--- a/lib/services/serviceBusManagement2/lib/serviceBusManagementClient.js
+++ b/lib/services/serviceBusManagement2/lib/serviceBusManagementClient.js
@@ -89,3 +89,6 @@ class ServiceBusManagementClient extends ServiceClient {
 }
 
 module.exports = ServiceBusManagementClient;
+module.exports['default'] = ServiceBusManagementClient;
+module.exports.ServiceBusManagementClient = ServiceBusManagementClient;
+module.exports.ServiceBusManagementModels = models;
diff --git a/lib/services/serviceBusManagement2/package.json b/lib/services/serviceBusManagement2/package.json
index 9532ce5caf..4c741e4072 100644
--- a/lib/services/serviceBusManagement2/package.json
+++ b/lib/services/serviceBusManagement2/package.json
@@ -1,31 +1,20 @@
 {
   "name": "azure-arm-sb",
   "author": "Microsoft Corporation",
-  "contributors": [
-    "Zeeshan Sayed <sazeesha@microsoft.com>",
-    "Amar Zavery <amzavery@microsoft.com>"
-  ],
-  "version": "2.1.0-preview",
-  "description": "Microsoft Servicebus Management Client Library for node",
-  "tags": [
-    "azure",
-    "sdk"
-  ],
-  "keywords": [
-    "node",
-    "azure"
-  ],
-  "main": "./lib/serviceBusManagementClient.js",
-  "types": "./lib/serviceBusManagementClient.d.ts",
-   "license": "MIT",
+  "description": "ServiceBusManagementClient Library with typescript type definitions for node",
+  "version": "2.2.0-preview",
   "dependencies": {
-    "ms-rest-azure": "^2.5.2",
-    "ms-rest": "^2.3.0"
+    "ms-rest": "^2.3.3",
+    "ms-rest-azure": "^2.5.5"
   },
-  "homepage": "http://github.com/Azure/azure-sdk-for-node",
+  "keywords": [ "node", "azure" ],
+  "license": "MIT",
+  "main": "./lib/serviceBusManagementClient.js",
+  "types": "./lib/serviceBusManagementClient.d.ts",
+  "homepage": "http://github.com/azure/azure-sdk-for-node",
   "repository": {
     "type": "git",
-    "url": "git@github.com:Azure/azure-sdk-for-node.git"
+    "url": "https://github.com/azure/azure-sdk-for-node.git"
   },
   "bugs": {
     "url": "http://github.com/Azure/azure-sdk-for-node/issues"