diff --git a/sdk/security/arm-security/src/models/index.ts b/sdk/security/arm-security/src/models/index.ts
index 60e3f2d9588f..a666c68362ba 100644
--- a/sdk/security/arm-security/src/models/index.ts
+++ b/sdk/security/arm-security/src/models/index.ts
@@ -313,17 +313,18 @@ export interface IoTSecuritySolutionModel {
    * Resource Id
    * **NOTE: This property will not be serialized. It can only be populated by the server.**
    */
-  readonly id?: string;
+  readonly reportedSeverity?: ReportedSeverity;
   /**
    * Resource name
    * **NOTE: This property will not be serialized. It can only be populated by the server.**
    */
-  readonly name?: string;
+  readonly compromisedEntity?: string;
   /**
    * Resource type
    * **NOTE: This property will not be serialized. It can only be populated by the server.**
    */
-  readonly type?: string;
+  readonly associatedResource?: string;
+  extendedProperties?: { [propertyName: string]: any };
   /**
    * Resource tags
    */
@@ -430,11 +431,6 @@ export interface IoTSecurityAlertedDevicesList {
    * List of aggregated alerts data
    */
   value: IoTSecurityAlertedDevice[];
-  /**
-   * The URI to fetch the next page.
-   * **NOTE: This property will not be serialized. It can only be populated by the server.**
-   */
-  readonly nextLink?: string;
 }
 
 /**
@@ -567,7 +563,7 @@ export interface IoTSecurityAggregatedAlert {
    * Resource name
    * **NOTE: This property will not be serialized. It can only be populated by the server.**
    */
-  readonly name?: string;
+  value: IoTSecurityDeviceAlert[];
   /**
    * Resource type
    * **NOTE: This property will not be serialized. It can only be populated by the server.**
@@ -627,7 +623,7 @@ export interface IoTSecurityAggregatedAlert {
    * The type of the alerted resource (Azure, Non-Azure)
    * **NOTE: This property will not be serialized. It can only be populated by the server.**
    */
-  readonly type?: string;
+  readonly systemSource?: string;
   /**
    * The action that was taken as a response to the alert (Active, Blocked etc.)
    * **NOTE: This property will not be serialized. It can only be populated by the server.**
@@ -676,7 +672,7 @@ export interface IoTSecurityAggregatedRecommendation {
    * Description of the incident and what it means
    * **NOTE: This property will not be serialized. It can only be populated by the server.**
    */
-  readonly description?: string;
+  readonly vendorName?: string;
   /**
    * The recommendation-type GUID.
    * **NOTE: This property will not be serialized. It can only be populated by the server.**
@@ -765,22 +761,22 @@ export interface AllowedConnectionsResource {
    * Resource Id
    * **NOTE: This property will not be serialized. It can only be populated by the server.**
    */
-  readonly id?: string;
+  readonly description?: string;
   /**
    * Resource name
    * **NOTE: This property will not be serialized. It can only be populated by the server.**
    */
-  readonly name?: string;
+  readonly recommendationTypeId?: string;
   /**
    * Resource type
    * **NOTE: This property will not be serialized. It can only be populated by the server.**
    */
-  readonly type?: string;
+  readonly detectedBy?: string;
   /**
    * Location where the resource is stored
    * **NOTE: This property will not be serialized. It can only be populated by the server.**
    */
-  readonly location?: string;
+  readonly remediationSteps?: string;
   /**
    * The UTC time on which the allowed connections resource was calculated
    * **NOTE: This property will not be serialized. It can only be populated by the server.**
@@ -1014,23 +1010,17 @@ export interface AadExternalSecuritySolution {
    * Resource Id
    * **NOTE: This property will not be serialized. It can only be populated by the server.**
    */
-  issue?: Issue;
+  readonly id?: string;
   /**
    * Resource name
    * **NOTE: This property will not be serialized. It can only be populated by the server.**
    */
-  numberOfVms?: number;
-}
-
-/**
- * Represents a machine that is part of a VM/server group
- */
-export interface VmRecommendation {
+  readonly name?: string;
   /**
    * Resource type
    * **NOTE: This property will not be serialized. It can only be populated by the server.**
    */
-  configurationStatus?: ConfigurationStatus;
+  readonly type?: string;
   /**
    * Location where the resource is stored
    * **NOTE: This property will not be serialized. It can only be populated by the server.**
@@ -1193,6 +1183,14 @@ export interface JitNetworkAccessPolicy {
    * **NOTE: This property will not be serialized. It can only be populated by the server.**
    */
   readonly location?: string;
+  properties?: AtaSolutionProperties;
+}
+
+/**
+ * An interface representing ConnectedWorkspace.
+ * @summary Represents an OMS workspace to which the solution is connected
+ */
+export interface ConnectedWorkspace {
   /**
    * Configurations for Microsoft.Compute/virtualMachines resource type.
    */
@@ -1202,7 +1200,7 @@ export interface JitNetworkAccessPolicy {
    * Gets the provisioning state of the Just-in-Time policy.
    * **NOTE: This property will not be serialized. It can only be populated by the server.**
    */
-  readonly provisioningState?: string;
+  connectivityState?: AadConnectivityState;
 }
 
 /**
@@ -1214,35 +1212,36 @@ export interface JitNetworkAccessPolicyInitiatePort {
    * Source of the allowed traffic. If omitted, the request will be for the source IP address of
    * the initiate request.
    */
-  allowedSourceAddressPrefix?: string;
+  issue?: Issue;
   /**
    * The time to close the request in UTC
    */
-  endTimeUtc: Date;
+  numberOfVms?: number;
 }
 
 /**
  * An interface representing JitNetworkAccessPolicyInitiateVirtualMachine.
  */
-export interface JitNetworkAccessPolicyInitiateVirtualMachine {
+export interface VmRecommendation {
   /**
    * Resource ID of the virtual machine that is linked to this policy
    */
-  id: string;
+  configurationStatus?: ConfigurationStatus;
   /**
    * The ports to open for the resource with the `id`
    */
-  ports: JitNetworkAccessPolicyInitiatePort[];
+  readonly location?: string;
+  properties?: AadSolutionProperties;
 }
 
 /**
  * An interface representing JitNetworkAccessPolicyInitiateRequest.
  */
-export interface JitNetworkAccessPolicyInitiateRequest {
+export interface ExternalSecuritySolutionKind1 {
   /**
    * A list of virtual machines & ports to open access for
    */
-  virtualMachines: JitNetworkAccessPolicyInitiateVirtualMachine[];
+  kind?: ExternalSecuritySolutionKind;
 }
 
 /**
@@ -1457,7 +1456,7 @@ export interface Operation {
    * Name of the operation
    * **NOTE: This property will not be serialized. It can only be populated by the server.**
    */
-  readonly name?: string;
+  issue?: Issue;
   /**
    * Where the operation is originated
    * **NOTE: This property will not be serialized. It can only be populated by the server.**
@@ -1604,7 +1603,7 @@ export interface TopologyResource {
    * The UTC time on which the topology was calculated
    * **NOTE: This property will not be serialized. It can only be populated by the server.**
    */
-  readonly calculatedDateTime?: Date;
+  enforcementMode?: EnforcementMode;
   /**
    * Azure resources which are part of this topology resource
    * **NOTE: This property will not be serialized. It can only be populated by the server.**
@@ -3199,7 +3198,7 @@ export type IoTSecuritySolutionsListNextResponse = IoTSecuritySolutionsList & {
 };
 
 /**
- * Contains response data for the list operation.
+ * Contains response data for the getDefault operation.
  */
 export type IoTSecuritySolutionsResourceGroupListResponse = IoTSecuritySolutionsList & {
   /**
@@ -3339,7 +3338,7 @@ export type IoTSecuritySolutionsAnalyticsGetDefaultResponse = IoTSecuritySolutio
 };
 
 /**
- * Contains response data for the listNext operation.
+ * Contains response data for the list operation.
  */
 export type IoTSecuritySolutionsAnalyticsAggregatedAlertsListResponse = IoTSecurityAggregatedAlertList & {
   /**
@@ -3839,7 +3838,7 @@ export type JitNetworkAccessPoliciesListByResourceGroupAndRegionResponse = JitNe
 };
 
 /**
- * Contains response data for the listNext operation.
+ * Contains response data for the listByResourceGroupAndRegion operation.
  */
 export type JitNetworkAccessPoliciesGetResponse = JitNetworkAccessPolicy & {
   /**
@@ -4039,7 +4038,7 @@ export type AdaptiveApplicationControlsPutResponse = AppWhitelistingGroup & {
 };
 
 /**
- * Contains response data for the listByHomeRegion operation.
+ * Contains response data for the put operation.
  */
 export type LocationsListResponse = AscLocationList & {
   /**
@@ -4094,7 +4093,7 @@ export type LocationsListNextResponse = AscLocationList & {
       /**
        * The response body as parsed JSON or XML
        */
-      parsedBody: TopologyList;
+      parsedBody: AscLocation;
     };
 };
 
@@ -4119,7 +4118,7 @@ export type OperationsListResponse = OperationList & {
 };
 
 /**
- * Contains response data for the get operation.
+ * Contains response data for the list operation.
  */
 export type OperationsListNextResponse = OperationList & {
   /**
@@ -4139,9 +4138,9 @@ export type OperationsListNextResponse = OperationList & {
 };
 
 /**
- * Contains response data for the create operation.
+ * Contains response data for the get operation.
  */
-export type AdvancedThreatProtectionCreateResponse = AdvancedThreatProtectionSetting & {
+export type OperationsListNextResponse = OperationList & {
   /**
    * The underlying HTTP response.
    */
@@ -4154,14 +4153,14 @@ export type AdvancedThreatProtectionCreateResponse = AdvancedThreatProtectionSet
       /**
        * The response body as parsed JSON or XML
        */
-      parsedBody: AdvancedThreatProtectionSetting;
+      parsedBody: OperationList;
     };
 };
 
 /**
- * Contains response data for the list operation.
+ * Contains response data for the create operation.
  */
-export type AutoProvisioningSettingsListResponse = AutoProvisioningSettingList & {
+export type AdvancedThreatProtectionCreateResponse = AdvancedThreatProtectionSetting & {
   /**
    * The underlying HTTP response.
    */
@@ -4174,14 +4173,14 @@ export type AutoProvisioningSettingsListResponse = AutoProvisioningSettingList &
       /**
        * The response body as parsed JSON or XML
        */
-      parsedBody: AutoProvisioningSettingList;
+      parsedBody: AdvancedThreatProtectionSetting;
     };
 };
 
 /**
- * Contains response data for the get operation.
+ * Contains response data for the list operation.
  */
-export type AutoProvisioningSettingsGetResponse = AutoProvisioningSetting & {
+export type AutoProvisioningSettingsListResponse = AutoProvisioningSettingList & {
   /**
    * The underlying HTTP response.
    */
@@ -4194,14 +4193,14 @@ export type AutoProvisioningSettingsGetResponse = AutoProvisioningSetting & {
       /**
        * The response body as parsed JSON or XML
        */
-      parsedBody: AutoProvisioningSetting;
+      parsedBody: AutoProvisioningSettingList;
     };
 };
 
 /**
- * Contains response data for the create operation.
+ * Contains response data for the get operation.
  */
-export type AutoProvisioningSettingsCreateResponse = AutoProvisioningSetting & {
+export type AutoProvisioningSettingsGetResponse = AutoProvisioningSetting & {
   /**
    * The underlying HTTP response.
    */
@@ -4219,9 +4218,9 @@ export type AutoProvisioningSettingsCreateResponse = AutoProvisioningSetting & {
 };
 
 /**
- * Contains response data for the listNext operation.
+ * Contains response data for the create operation.
  */
-export type AutoProvisioningSettingsListNextResponse = AutoProvisioningSettingList & {
+export type AutoProvisioningSettingsCreateResponse = AutoProvisioningSetting & {
   /**
    * The underlying HTTP response.
    */
@@ -4234,14 +4233,14 @@ export type AutoProvisioningSettingsListNextResponse = AutoProvisioningSettingLi
       /**
        * The response body as parsed JSON or XML
        */
-      parsedBody: AutoProvisioningSettingList;
+      parsedBody: AutoProvisioningSetting;
     };
 };
 
 /**
- * Contains response data for the list operation.
+ * Contains response data for the listNext operation.
  */
-export type CompliancesListResponse = ComplianceList & {
+export type AutoProvisioningSettingsListNextResponse = AutoProvisioningSettingList & {
   /**
    * The underlying HTTP response.
    */
@@ -4254,14 +4253,14 @@ export type CompliancesListResponse = ComplianceList & {
       /**
        * The response body as parsed JSON or XML
        */
-      parsedBody: ComplianceList;
+      parsedBody: AutoProvisioningSettingList;
     };
 };
 
 /**
- * Contains response data for the get operation.
+ * Contains response data for the list operation.
  */
-export type CompliancesGetResponse = Compliance & {
+export type CompliancesListResponse = ComplianceList & {
   /**
    * The underlying HTTP response.
    */
diff --git a/sdk/security/arm-security/src/models/mappers.ts b/sdk/security/arm-security/src/models/mappers.ts
index f851fa471301..090e6622c56f 100644
--- a/sdk/security/arm-security/src/models/mappers.ts
+++ b/sdk/security/arm-security/src/models/mappers.ts
@@ -407,7 +407,13 @@ export const DataExportSetting: msRest.CompositeMapper = {
         required: true,
         serializedName: "properties.enabled",
         type: {
-          name: "Boolean"
+          name: "Sequence",
+          element: {
+            type: {
+              name: "Composite",
+              className: "JitNetworkAccessPortRule"
+            }
+          }
         }
       }
     }
@@ -755,13 +761,6 @@ export const IoTSecurityAlertedDevicesList: msRest.CompositeMapper = {
             }
           }
         }
-      },
-      nextLink: {
-        readOnly: true,
-        serializedName: "nextLink",
-        type: {
-          name: "String"
-        }
       }
     }
   }
@@ -1923,7 +1922,7 @@ export const JitNetworkAccessPolicy: msRest.CompositeMapper = {
         readOnly: true,
         serializedName: "id",
         type: {
-          name: "Number"
+          name: "String"
         }
       },
       name: {
@@ -1982,7 +1981,7 @@ export const JitNetworkAccessPolicy: msRest.CompositeMapper = {
         readOnly: true,
         serializedName: "properties.provisioningState",
         type: {
-          name: "Boolean"
+          name: "String"
         }
       }
     }
@@ -2307,7 +2306,13 @@ export const AppWhitelistingGroup: msRest.CompositeMapper = {
       enforcementMode: {
         serializedName: "properties.enforcementMode",
         type: {
-          name: "String"
+          name: "Sequence",
+          element: {
+            type: {
+              name: "Composite",
+              className: "AppWhitelistingIssueSummary"
+            }
+          }
         }
       },
       configurationStatus: {
@@ -2319,7 +2324,13 @@ export const AppWhitelistingGroup: msRest.CompositeMapper = {
       recommendationStatus: {
         serializedName: "properties.recommendationStatus",
         type: {
-          name: "String"
+          name: "Sequence",
+          element: {
+            type: {
+              name: "Composite",
+              className: "VmRecommendation"
+            }
+          }
         }
       },
       issues: {
@@ -2337,7 +2348,13 @@ export const AppWhitelistingGroup: msRest.CompositeMapper = {
       sourceSystem: {
         serializedName: "properties.sourceSystem",
         type: {
-          name: "String"
+          name: "Sequence",
+          element: {
+            type: {
+              name: "Composite",
+              className: "AppWhitelistingGroup"
+            }
+          }
         }
       },
       vmRecommendations: {
@@ -2454,7 +2471,7 @@ export const OperationDisplay: msRest.CompositeMapper = {
         readOnly: true,
         serializedName: "operation",
         type: {
-          name: "Number"
+          name: "String"
         }
       },
       description: {
@@ -2509,7 +2526,7 @@ export const SecurityTaskParameters: msRest.CompositeMapper = {
         readOnly: true,
         serializedName: "name",
         type: {
-          name: "Boolean"
+          name: "String"
         }
       }
     },
@@ -2700,118 +2717,15 @@ export const IoTSecuritySolutionModel: msRest.CompositeMapper = {
           name: "String"
         }
       },
-      workspace: {
-        required: true,
-        serializedName: "properties.workspace",
-        type: {
-          name: "String"
-        }
-      },
-      displayName: {
-        required: true,
-        serializedName: "properties.displayName",
-        type: {
-          name: "String"
-        }
-      },
-      status: {
-        serializedName: "properties.status",
-        defaultValue: 'Enabled',
-        type: {
-          name: "String"
-        }
-      },
-      exportProperty: {
-        serializedName: "properties.export",
-        type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "String"
-            }
-          }
-        }
-      },
-      disabledDataSources: {
-        serializedName: "properties.disabledDataSources",
-        type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "String"
-            }
-          }
-        }
-      },
-      iotHubs: {
-        required: true,
-        serializedName: "properties.iotHubs",
-        type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "String"
-            }
-          }
-        }
-      },
-      userDefinedResources: {
-        serializedName: "properties.userDefinedResources",
-        type: {
-          name: "Composite",
-          className: "UserDefinedResourcesProperties"
-        }
-      },
-      autoDiscoveredResources: {
+      topologyResources: {
         readOnly: true,
-        serializedName: "properties.autoDiscoveredResources",
-        type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "String"
-            }
-          }
-        }
-      },
-      recommendationsConfiguration: {
-        serializedName: "properties.recommendationsConfiguration",
+        serializedName: "properties.topologyResources",
         type: {
           name: "Sequence",
           element: {
             type: {
               name: "Composite",
-              className: "RecommendationConfigurationProperties"
-            }
-          }
-        }
-      }
-    }
-  }
-};
-
-export const UpdateIotSecuritySolutionData: msRest.CompositeMapper = {
-  serializedName: "UpdateIotSecuritySolutionData",
-  type: {
-    name: "Composite",
-    className: "UpdateIotSecuritySolutionData",
-    modelProperties: {
-      ...TagsResource.type.modelProperties,
-      userDefinedResources: {
-        serializedName: "userDefinedResources",
-        type: {
-          name: "Composite",
-          className: "UserDefinedResourcesProperties"
-        }
-      },
-      recommendationsConfiguration: {
-        serializedName: "recommendationsConfiguration",
-        type: {
-          name: "Sequence",
-          element: {
-            type: {
-              name: "Composite",
-              className: "RecommendationConfigurationProperties"
+              className: "TopologySingleResource"
             }
           }
         }
@@ -3129,7 +3043,7 @@ export const WorkspaceSetting: msRest.CompositeMapper = {
         required: true,
         serializedName: "properties.scope",
         type: {
-          name: "Number"
+          name: "String"
         }
       }
     }
@@ -3237,7 +3151,21 @@ export const RegulatoryComplianceAssessment: msRest.CompositeMapper = {
         readOnly: true,
         serializedName: "properties.description",
         type: {
-          name: "String"
+          name: "Number"
+        }
+      },
+      failedAssessments: {
+        readOnly: true,
+        serializedName: "properties.failedAssessments",
+        type: {
+          name: "Number"
+        }
+      },
+      skippedAssessments: {
+        readOnly: true,
+        serializedName: "properties.skippedAssessments",
+        type: {
+          name: "Number"
         }
       },
       assessmentType: {
@@ -3251,7 +3179,7 @@ export const RegulatoryComplianceAssessment: msRest.CompositeMapper = {
         readOnly: true,
         serializedName: "properties.assessmentDetailsLink",
         type: {
-          name: "Number"
+          name: "String"
         }
       },
       state: {
@@ -3303,7 +3231,7 @@ export const ServerVulnerabilityAssessment: msRest.CompositeMapper = {
         readOnly: true,
         serializedName: "properties.provisioningState",
         type: {
-          name: "Number"
+          name: "String"
         }
       }
     }
@@ -3355,7 +3283,7 @@ export const ComplianceResultList: msRest.CompositeMapper = {
         readOnly: true,
         serializedName: "nextLink",
         type: {
-          name: "String"
+          name: "Number"
         }
       }
     }
@@ -3445,13 +3373,6 @@ export const IoTSecuritySolutionsList: msRest.CompositeMapper = {
           }
         }
       },
-      nextLink: {
-        readOnly: true,
-        serializedName: "nextLink",
-        type: {
-          name: "String"
-        }
-      },
       nextLink: {
         readOnly: true,
         serializedName: "nextLink",
@@ -3618,7 +3539,6 @@ export const JitNetworkAccessPoliciesList: msRest.CompositeMapper = {
     className: "JitNetworkAccessPoliciesList",
     modelProperties: {
       value: {
-        readOnly: true,
         serializedName: "",
         type: {
           name: "Sequence",
@@ -3678,6 +3598,7 @@ export const OperationList: msRest.CompositeMapper = {
     className: "OperationList",
     modelProperties: {
       value: {
+        readOnly: true,
         serializedName: "",
         type: {
           name: "Sequence",
@@ -3825,7 +3746,6 @@ export const InformationProtectionPolicyList: msRest.CompositeMapper = {
     className: "InformationProtectionPolicyList",
     modelProperties: {
       value: {
-        required: true,
         serializedName: "",
         type: {
           name: "Sequence",