diff --git a/packages/@azure/arm-network/lib/models/applicationGatewaysMappers.ts b/packages/@azure/arm-network/lib/models/applicationGatewaysMappers.ts
index 65872f27b37a..ff75b514694b 100644
--- a/packages/@azure/arm-network/lib/models/applicationGatewaysMappers.ts
+++ b/packages/@azure/arm-network/lib/models/applicationGatewaysMappers.ts
@@ -80,11 +80,8 @@ export {
   ApplicationGatewayBackendHealthPool,
   ApplicationGatewayBackendHealthHttpSettings,
   ApplicationGatewayBackendHealthServer,
-  ApplicationGatewayAvailableServerVariablesResult,
   ErrorModel,
   ErrorDetails,
-  ApplicationGatewayAvailableRequestHeadersResult,
-  ApplicationGatewayAvailableResponseHeadersResult,
   ApplicationGatewayAvailableWafRuleSetsResult,
   ApplicationGatewayFirewallRuleSet,
   ApplicationGatewayFirewallRuleGroup,
diff --git a/packages/@azure/arm-network/lib/models/index.ts b/packages/@azure/arm-network/lib/models/index.ts
index 57f217222baa..24a6b7daa37f 100644
--- a/packages/@azure/arm-network/lib/models/index.ts
+++ b/packages/@azure/arm-network/lib/models/index.ts
@@ -2911,48 +2911,6 @@ export interface ApplicationGateway extends Resource {
   identity?: ManagedServiceIdentity;
 }
 
-/**
- * @interface
- * An interface representing ApplicationGatewayAvailableServerVariablesResult.
- * Response for ApplicationGatewayAvailableServerVariables API service call.
- *
- */
-export interface ApplicationGatewayAvailableServerVariablesResult {
-  /**
-   * @member {string[]} [value] The list of supported server variables in
-   * application gateway.
-   */
-  value?: string[];
-}
-
-/**
- * @interface
- * An interface representing ApplicationGatewayAvailableRequestHeadersResult.
- * Response for ApplicationGatewayAvailableRequestHeaders API service call.
- *
- */
-export interface ApplicationGatewayAvailableRequestHeadersResult {
-  /**
-   * @member {string[]} [value] The list of supported request headers in
-   * application gateway.
-   */
-  value?: string[];
-}
-
-/**
- * @interface
- * An interface representing ApplicationGatewayAvailableResponseHeadersResult.
- * Response for ApplicationGatewayAvailableResponeHeaders API service call.
- *
- */
-export interface ApplicationGatewayAvailableResponseHeadersResult {
-  /**
-   * @member {string[]} [value] The list of supported response header in
-   * application gateway.
-   */
-  value?: string[];
-}
-
 /**
  * @interface
  * An interface representing ApplicationGatewayFirewallRule.
@@ -3380,7 +3338,7 @@ export interface AzureFirewallNatRule {
   sourceAddresses?: string[];
   /**
    * @member {string[]} [destinationAddresses] List of destination IP addresses
-   * for this rule.
+   * for this rule. Supports IP ranges, prefixes, and service tags.
    */
   destinationAddresses?: string[];
   /**
@@ -12476,7 +12434,7 @@ export type ApplicationGatewaysBackendHealthResponse = ApplicationGatewayBackend
 /**
  * Contains response data for the listAvailableServerVariables operation.
  */
-export type ApplicationGatewaysListAvailableServerVariablesResponse = ApplicationGatewayAvailableServerVariablesResult & {
+export type ApplicationGatewaysListAvailableServerVariablesResponse = Array<string> & {
   /**
    * The underlying HTTP response.
    */
@@ -12488,14 +12446,14 @@ export type ApplicationGatewaysListAvailableServerVariablesResponse = Applicatio
       /**
        * The response body as parsed JSON or XML
        */
-      parsedBody: ApplicationGatewayAvailableServerVariablesResult;
+      parsedBody: string[];
     };
 };
 
 /**
  * Contains response data for the listAvailableRequestHeaders operation.
  */
-export type ApplicationGatewaysListAvailableRequestHeadersResponse = ApplicationGatewayAvailableRequestHeadersResult & {
+export type ApplicationGatewaysListAvailableRequestHeadersResponse = Array<string> & {
   /**
    * The underlying HTTP response.
    */
@@ -12507,14 +12465,14 @@ export type ApplicationGatewaysListAvailableRequestHeadersResponse = Application
       /**
        * The response body as parsed JSON or XML
        */
-      parsedBody: ApplicationGatewayAvailableRequestHeadersResult;
+      parsedBody: string[];
     };
 };
 
 /**
  * Contains response data for the listAvailableResponseHeaders operation.
  */
-export type ApplicationGatewaysListAvailableResponseHeadersResponse = ApplicationGatewayAvailableResponseHeadersResult & {
+export type ApplicationGatewaysListAvailableResponseHeadersResponse = Array<string> & {
   /**
    * The underlying HTTP response.
    */
@@ -12526,7 +12484,7 @@ export type ApplicationGatewaysListAvailableResponseHeadersResponse = Applicatio
       /**
        * The response body as parsed JSON or XML
        */
-      parsedBody: ApplicationGatewayAvailableResponseHeadersResult;
+      parsedBody: string[];
     };
 };
 
diff --git a/packages/@azure/arm-network/lib/models/mappers.ts b/packages/@azure/arm-network/lib/models/mappers.ts
index 5cb8c359367d..66ffec88b2d8 100644
--- a/packages/@azure/arm-network/lib/models/mappers.ts
+++ b/packages/@azure/arm-network/lib/models/mappers.ts
@@ -3910,69 +3910,6 @@ export const ApplicationGateway: msRest.CompositeMapper = {
   }
 };
 
-export const ApplicationGatewayAvailableServerVariablesResult: msRest.CompositeMapper = {
-  serializedName: "ApplicationGatewayAvailableServerVariablesResult",
-  type: {
-    name: "Composite",
-    className: "ApplicationGatewayAvailableServerVariablesResult",
-    modelProperties: {
-      value: {
-        serializedName: "value",
-        type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "String"
-            }
-          }
-        }
-      }
-    }
-  }
-};
-
-export const ApplicationGatewayAvailableRequestHeadersResult: msRest.CompositeMapper = {
-  serializedName: "ApplicationGatewayAvailableRequestHeadersResult",
-  type: {
-    name: "Composite",
-    className: "ApplicationGatewayAvailableRequestHeadersResult",
-    modelProperties: {
-      value: {
-        serializedName: "value",
-        type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "String"
-            }
-          }
-        }
-      }
-    }
-  }
-};
-
-export const ApplicationGatewayAvailableResponseHeadersResult: msRest.CompositeMapper = {
-  serializedName: "ApplicationGatewayAvailableResponseHeadersResult",
-  type: {
-    name: "Composite",
-    className: "ApplicationGatewayAvailableResponseHeadersResult",
-    modelProperties: {
-      value: {
-        serializedName: "value",
-        type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "String"
-            }
-          }
-        }
-      }
-    }
-  }
-};
-
 export const ApplicationGatewayFirewallRule: msRest.CompositeMapper = {
   serializedName: "ApplicationGatewayFirewallRule",
   type: {
diff --git a/packages/@azure/arm-network/lib/operations/applicationGateways.ts b/packages/@azure/arm-network/lib/operations/applicationGateways.ts
index 56c80f1aac6f..0414194fa266 100644
--- a/packages/@azure/arm-network/lib/operations/applicationGateways.ts
+++ b/packages/@azure/arm-network/lib/operations/applicationGateways.ts
@@ -194,13 +194,13 @@ export class ApplicationGateways {
   /**
    * @param callback The callback
    */
-  listAvailableServerVariables(callback: msRest.ServiceCallback<Models.ApplicationGatewayAvailableServerVariablesResult>): void;
+  listAvailableServerVariables(callback: msRest.ServiceCallback<string[]>): void;
   /**
    * @param options The optional parameters
    * @param callback The callback
    */
-  listAvailableServerVariables(options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApplicationGatewayAvailableServerVariablesResult>): void;
-  listAvailableServerVariables(options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApplicationGatewayAvailableServerVariablesResult>, callback?: msRest.ServiceCallback<Models.ApplicationGatewayAvailableServerVariablesResult>): Promise<Models.ApplicationGatewaysListAvailableServerVariablesResponse> {
+  listAvailableServerVariables(options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<string[]>): void;
+  listAvailableServerVariables(options?: msRest.RequestOptionsBase | msRest.ServiceCallback<string[]>, callback?: msRest.ServiceCallback<string[]>): Promise<Models.ApplicationGatewaysListAvailableServerVariablesResponse> {
     return this.client.sendOperationRequest(
       {
         options
@@ -218,13 +218,13 @@ export class ApplicationGateways {
   /**
    * @param callback The callback
    */
-  listAvailableRequestHeaders(callback: msRest.ServiceCallback<Models.ApplicationGatewayAvailableRequestHeadersResult>): void;
+  listAvailableRequestHeaders(callback: msRest.ServiceCallback<string[]>): void;
   /**
    * @param options The optional parameters
    * @param callback The callback
    */
-  listAvailableRequestHeaders(options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApplicationGatewayAvailableRequestHeadersResult>): void;
-  listAvailableRequestHeaders(options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApplicationGatewayAvailableRequestHeadersResult>, callback?: msRest.ServiceCallback<Models.ApplicationGatewayAvailableRequestHeadersResult>): Promise<Models.ApplicationGatewaysListAvailableRequestHeadersResponse> {
+  listAvailableRequestHeaders(options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<string[]>): void;
+  listAvailableRequestHeaders(options?: msRest.RequestOptionsBase | msRest.ServiceCallback<string[]>, callback?: msRest.ServiceCallback<string[]>): Promise<Models.ApplicationGatewaysListAvailableRequestHeadersResponse> {
     return this.client.sendOperationRequest(
       {
         options
@@ -242,13 +242,13 @@ export class ApplicationGateways {
   /**
    * @param callback The callback
    */
-  listAvailableResponseHeaders(callback: msRest.ServiceCallback<Models.ApplicationGatewayAvailableResponseHeadersResult>): void;
+  listAvailableResponseHeaders(callback: msRest.ServiceCallback<string[]>): void;
   /**
    * @param options The optional parameters
    * @param callback The callback
    */
-  listAvailableResponseHeaders(options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ApplicationGatewayAvailableResponseHeadersResult>): void;
-  listAvailableResponseHeaders(options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ApplicationGatewayAvailableResponseHeadersResult>, callback?: msRest.ServiceCallback<Models.ApplicationGatewayAvailableResponseHeadersResult>): Promise<Models.ApplicationGatewaysListAvailableResponseHeadersResponse> {
+  listAvailableResponseHeaders(options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<string[]>): void;
+  listAvailableResponseHeaders(options?: msRest.RequestOptionsBase | msRest.ServiceCallback<string[]>, callback?: msRest.ServiceCallback<string[]>): Promise<Models.ApplicationGatewaysListAvailableResponseHeadersResponse> {
     return this.client.sendOperationRequest(
       {
         options
@@ -642,7 +642,17 @@ const listAvailableServerVariablesOperationSpec: msRest.OperationSpec = {
   ],
   responses: {
     200: {
-      bodyMapper: Mappers.ApplicationGatewayAvailableServerVariablesResult
+      bodyMapper: {
+        serializedName: "parsedResponse",
+        type: {
+          name: "Sequence",
+          element: {
+            type: {
+              name: "String"
+            }
+          }
+        }
+      }
     },
     default: {
       bodyMapper: Mappers.ErrorModel
@@ -665,7 +675,17 @@ const listAvailableRequestHeadersOperationSpec: msRest.OperationSpec = {
   ],
   responses: {
     200: {
-      bodyMapper: Mappers.ApplicationGatewayAvailableRequestHeadersResult
+      bodyMapper: {
+        serializedName: "parsedResponse",
+        type: {
+          name: "Sequence",
+          element: {
+            type: {
+              name: "String"
+            }
+          }
+        }
+      }
     },
     default: {
       bodyMapper: Mappers.ErrorModel
@@ -688,7 +708,17 @@ const listAvailableResponseHeadersOperationSpec: msRest.OperationSpec = {
   ],
   responses: {
     200: {
-      bodyMapper: Mappers.ApplicationGatewayAvailableResponseHeadersResult
+      bodyMapper: {
+        serializedName: "parsedResponse",
+        type: {
+          name: "Sequence",
+          element: {
+            type: {
+              name: "String"
+            }
+          }
+        }
+      }
     },
     default: {
       bodyMapper: Mappers.ErrorModel