diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Custom/ArmSelfHelpModelFactory.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Custom/ArmSelfHelpModelFactory.cs
index 5e655cf300fd..b0dfa5a6bf66 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Custom/ArmSelfHelpModelFactory.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Custom/ArmSelfHelpModelFactory.cs
@@ -24,7 +24,8 @@ public static partial class ArmSelfHelpModelFactory
         [EditorBrowsable(EditorBrowsableState.Never)]
         public static SelfHelpSolutionMetadata SelfHelpSolutionMetadata(ResourceIdentifier id, string name, ResourceType resourceType, ResourceManager.Models.SystemData systemData, string solutionId, string solutionType, string description, IEnumerable<IList<string>> requiredParameterSets)
         {
-            return new SelfHelpSolutionMetadata(id, name, resourceType, systemData, default, serializedAdditionalRawData: null);
+            throw new NotImplementedException();
+            //return new SelfHelpSolutionMetadata(id, name, resourceType, systemData, default, serializedAdditionalRawData: null);
         }
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Custom/Extensions/MockableSelfHelpArmClient.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Custom/Extensions/MockableSelfHelpArmClient.cs
index 955fa62674ee..7ef2acd6d1a7 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Custom/Extensions/MockableSelfHelpArmClient.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Custom/Extensions/MockableSelfHelpArmClient.cs
@@ -13,11 +13,10 @@ namespace Azure.ResourceManager.SelfHelp.Mocking
 {
     public partial class MockableSelfHelpArmClient : ArmResource
     {
-        private ClientDiagnostics _discoverySolutionClientDiagnostics;
-        private DiscoverySolutionRestOperations _discoverySolutionRestClient;
+        //private ClientDiagnostics _discoverySolutionClientDiagnostics;
+        //private DiscoverySolution _discoverySolutionRestClient;
 
-        private ClientDiagnostics DiscoverySolutionClientDiagnostics => _discoverySolutionClientDiagnostics ??= new ClientDiagnostics("Azure.ResourceManager.SelfHelp", ProviderConstants.DefaultProviderNamespace, Diagnostics);
-        private DiscoverySolutionRestOperations DiscoverySolutionRestClient => _discoverySolutionRestClient ??= new DiscoverySolutionRestOperations(Pipeline, Diagnostics.ApplicationId, Endpoint);
+        //private ClientDiagnostics DiscoverySolutionClientDiagnostics => _discoverySolutionClientDiagnostics ??= new ClientDiagnostics("Azure.ResourceManager.SelfHelp", ProviderConstants.DefaultProviderNamespace, Diagnostics);
 
         /// <summary>
         /// Lists the relevant Azure diagnostics and solutions using [problemClassification API](https://learn.microsoft.com/rest/api/support/problem-classifications/list?tabs=HTTP)) AND  resourceUri or resourceType.&lt;br/&gt; Discovery Solutions is the initial entry point within Help API, which identifies relevant Azure diagnostics and solutions. We will do our best to return the most effective solutions based on the type of inputs, in the request URL  &lt;br/&gt;&lt;br/&gt; Mandatory input :  problemClassificationId (Use the [problemClassification API](https://learn.microsoft.com/rest/api/support/problem-classifications/list?tabs=HTTP)) &lt;br/&gt;Optional input: resourceUri OR resource Type &lt;br/&gt;&lt;br/&gt; &lt;b&gt;Note: &lt;/b&gt;  ‘requiredInputs’ from Discovery solutions response must be passed via ‘additionalParameters’ as an input to Diagnostics and Solutions API.
@@ -43,11 +42,7 @@ public partial class MockableSelfHelpArmClient : ArmResource
         [EditorBrowsable(EditorBrowsableState.Never)]
         public virtual Pageable<SelfHelpSolutionMetadata> GetSelfHelpDiscoverySolutions(ResourceIdentifier scope, string filter = null, string skiptoken = null, CancellationToken cancellationToken = default)
         {
-            Argument.AssertNotNull(scope, nameof(scope));
-
-            HttpMessage FirstPageRequest(int? pageSizeHint) => DiscoverySolutionRestClient.CreateDiscoverSolutionsRequest(filter, skiptoken);
-            HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => DiscoverySolutionRestClient.CreateDiscoverSolutionsNextPageRequest(nextLink, filter, skiptoken);
-            return GeneratorPageableHelpers.CreatePageable(FirstPageRequest, NextPageRequest, e => SelfHelpSolutionMetadata.DeserializeSelfHelpSolutionMetadata(e), DiscoverySolutionClientDiagnostics, Pipeline, "MockableSelfHelpArmClient.GetSelfHelpDiscoverySolutions", "value", "nextLink", cancellationToken);
+            throw new NotImplementedException();
         }
 
         /// <summary>
@@ -74,11 +69,7 @@ public virtual Pageable<SelfHelpSolutionMetadata> GetSelfHelpDiscoverySolutions(
         [EditorBrowsable(EditorBrowsableState.Never)]
         public virtual AsyncPageable<SelfHelpSolutionMetadata> GetSelfHelpDiscoverySolutionsAsync(ResourceIdentifier scope, string filter = null, string skiptoken = null, CancellationToken cancellationToken = default)
         {
-            Argument.AssertNotNull(scope, nameof(scope));
-
-            HttpMessage FirstPageRequest(int? pageSizeHint) => DiscoverySolutionRestClient.CreateDiscoverSolutionsRequest(filter, skiptoken);
-            HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => DiscoverySolutionRestClient.CreateDiscoverSolutionsNextPageRequest(nextLink, filter, skiptoken);
-            return GeneratorPageableHelpers.CreateAsyncPageable(FirstPageRequest, NextPageRequest, e => SelfHelpSolutionMetadata.DeserializeSelfHelpSolutionMetadata(e), DiscoverySolutionClientDiagnostics, Pipeline, "MockableSelfHelpArmClient.GetSelfHelpDiscoverySolutions", "value", "nextLink", cancellationToken);
+            throw new NotImplementedException();
         }
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Custom/Models/SelfHelpSolutionMetadata.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Custom/Models/SelfHelpSolutionMetadata.Serialization.cs
index 3a7c87d7ddee..5487237eb3c8 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Custom/Models/SelfHelpSolutionMetadata.Serialization.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Custom/Models/SelfHelpSolutionMetadata.Serialization.cs
@@ -164,7 +164,7 @@ internal static SelfHelpSolutionMetadata DeserializeSelfHelpSolutionMetadata(Jso
                             List<SolutionMetadataProperties> array = new List<SolutionMetadataProperties>();
                             foreach (var item in property0.Value.EnumerateArray())
                             {
-                                array.Add(SolutionMetadataProperties.DeserializeSolutionMetadataProperties(item));
+                                array.Add(SolutionMetadataProperties.DeserializeSolutionMetadataProperties(item, default));
                             }
                             solutions = array;
                             continue;
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/ArmSelfHelpModelFactory.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/ArmSelfHelpModelFactory.cs
index fd9f3a5b6905..07c95365e06b 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/ArmSelfHelpModelFactory.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/ArmSelfHelpModelFactory.cs
@@ -8,86 +8,96 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Azure;
 using Azure.Core;
 using Azure.ResourceManager.Models;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
-    /// <summary> Model factory for models. </summary>
+    /// <summary> A factory class for creating instances of the models for mocking. </summary>
     public static partial class ArmSelfHelpModelFactory
     {
-        /// <summary> Initializes a new instance of <see cref="SelfHelp.SelfHelpDiagnosticData"/>. </summary>
-        /// <param name="id"> The id. </param>
-        /// <param name="name"> The name. </param>
-        /// <param name="resourceType"> The resourceType. </param>
-        /// <param name="systemData"> The systemData. </param>
+
+        /// <param name="id"> Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. </param>
+        /// <param name="name"> The name of the resource. </param>
+        /// <param name="resourceType"> The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts". </param>
+        /// <param name="systemData"> Azure Resource Manager metadata containing createdBy and modifiedBy information. </param>
         /// <param name="globalParameters"> Global parameters is an optional map which can be used to add key and  value to request body to improve the diagnostics results. </param>
         /// <param name="insights"> SolutionIds that are needed to be invoked. </param>
         /// <param name="acceptedOn"> Diagnostic Request Accepted time. </param>
         /// <param name="provisioningState"> Status of diagnostic provisioning. </param>
         /// <param name="diagnostics"> Array of Diagnostics. </param>
         /// <returns> A new <see cref="SelfHelp.SelfHelpDiagnosticData"/> instance for mocking. </returns>
-        public static SelfHelpDiagnosticData SelfHelpDiagnosticData(ResourceIdentifier id = null, string name = null, ResourceType resourceType = default, SystemData systemData = null, IDictionary<string, string> globalParameters = null, IEnumerable<SelfHelpDiagnosticInvocation> insights = null, DateTimeOffset? acceptedOn = null, SelfHelpProvisioningState? provisioningState = null, IEnumerable<SelfHelpDiagnosticInfo> diagnostics = null)
+        public static SelfHelpDiagnosticData SelfHelpDiagnosticData(ResourceIdentifier id = default, string name = default, ResourceType resourceType = default, SystemData systemData = default, IDictionary<string, string> globalParameters = default, IEnumerable<SelfHelpDiagnosticInvocation> insights = default, DateTimeOffset? acceptedOn = default, SelfHelpProvisioningState? provisioningState = default, IEnumerable<SelfHelpDiagnosticInfo> diagnostics = default)
         {
-            globalParameters ??= new Dictionary<string, string>();
-            insights ??= new List<SelfHelpDiagnosticInvocation>();
-            diagnostics ??= new List<SelfHelpDiagnosticInfo>();
-
             return new SelfHelpDiagnosticData(
                 id,
                 name,
                 resourceType,
                 systemData,
-                globalParameters,
-                insights?.ToList(),
-                acceptedOn,
-                provisioningState,
-                diagnostics?.ToList(),
-                serializedAdditionalRawData: null);
+                additionalBinaryDataProperties: null,
+                globalParameters is null && insights is null && acceptedOn is null && provisioningState is null && diagnostics is null ? default : new SelfHelpDiagnosticResourceProperties(
+                    globalParameters,
+                    (insights ?? new ChangeTrackingList<SelfHelpDiagnosticInvocation>()).ToList(),
+                    acceptedOn,
+                    provisioningState,
+                    (diagnostics ?? new ChangeTrackingList<SelfHelpDiagnosticInfo>()).ToList(),
+                    null));
         }
 
-        /// <summary> Initializes a new instance of <see cref="Models.SelfHelpDiagnosticInfo"/>. </summary>
+        /// <summary> Solution Invocation with additional params needed for invocation. </summary>
+        /// <param name="solutionId"> Solution Id to invoke. </param>
+        /// <param name="additionalParameters"> Additional parameters required to invoke the solutionId. </param>
+        /// <returns> A new <see cref="Models.SelfHelpDiagnosticInvocation"/> instance for mocking. </returns>
+        public static SelfHelpDiagnosticInvocation SelfHelpDiagnosticInvocation(string solutionId = default, IDictionary<string, string> additionalParameters = default)
+        {
+            additionalParameters ??= new ChangeTrackingDictionary<string, string>();
+
+            return new SelfHelpDiagnosticInvocation(solutionId, additionalParameters, additionalBinaryDataProperties: null);
+        }
+
+        /// <summary> Properties returned with in an insight. </summary>
         /// <param name="solutionId"> Solution Id. </param>
         /// <param name="status"> Denotes the status of the diagnostic resource. </param>
         /// <param name="insights"> The problems (if any) detected by this insight. </param>
         /// <param name="error"> Error definition. </param>
         /// <returns> A new <see cref="Models.SelfHelpDiagnosticInfo"/> instance for mocking. </returns>
-        public static SelfHelpDiagnosticInfo SelfHelpDiagnosticInfo(string solutionId = null, SelfHelpDiagnosticStatus? status = null, IEnumerable<SelfHelpDiagnosticInsight> insights = null, SelfHelpError error = null)
+        public static SelfHelpDiagnosticInfo SelfHelpDiagnosticInfo(string solutionId = default, SelfHelpDiagnosticStatus? status = default, IEnumerable<SelfHelpDiagnosticInsight> insights = default, SelfHelpError error = default)
         {
-            insights ??= new List<SelfHelpDiagnosticInsight>();
+            insights ??= new ChangeTrackingList<SelfHelpDiagnosticInsight>();
 
-            return new SelfHelpDiagnosticInfo(solutionId, status, insights?.ToList(), error, serializedAdditionalRawData: null);
+            return new SelfHelpDiagnosticInfo(solutionId, status, insights.ToList(), error, additionalBinaryDataProperties: null);
         }
 
-        /// <summary> Initializes a new instance of <see cref="Models.SelfHelpDiagnosticInsight"/>. </summary>
+        /// <summary> Detailed insights(s) obtained via the invocation of an insight diagnostic. </summary>
         /// <param name="id"> Article id. </param>
         /// <param name="title"> This insight's title. </param>
         /// <param name="results"> Detailed result content. </param>
         /// <param name="insightImportanceLevel"> Importance level of the insight. </param>
         /// <returns> A new <see cref="Models.SelfHelpDiagnosticInsight"/> instance for mocking. </returns>
-        public static SelfHelpDiagnosticInsight SelfHelpDiagnosticInsight(string id = null, string title = null, string results = null, SelfHelpImportanceLevel? insightImportanceLevel = null)
+        public static SelfHelpDiagnosticInsight SelfHelpDiagnosticInsight(string id = default, string title = default, string results = default, SelfHelpImportanceLevel? insightImportanceLevel = default)
         {
-            return new SelfHelpDiagnosticInsight(id, title, results, insightImportanceLevel, serializedAdditionalRawData: null);
+            return new SelfHelpDiagnosticInsight(id, title, results, insightImportanceLevel, additionalBinaryDataProperties: null);
         }
 
-        /// <summary> Initializes a new instance of <see cref="Models.SelfHelpError"/>. </summary>
+        /// <summary> Error definition. </summary>
         /// <param name="code"> Service specific error code which serves as the substatus for the HTTP error code. </param>
         /// <param name="errorType"> Service specific error type which serves as additional context for the error herein. </param>
         /// <param name="message"> Description of the error. </param>
         /// <param name="details"> An array of additional nested error response info objects, as described by this contract. </param>
         /// <returns> A new <see cref="Models.SelfHelpError"/> instance for mocking. </returns>
-        public static SelfHelpError SelfHelpError(string code = null, string errorType = null, string message = null, IEnumerable<SelfHelpError> details = null)
+        public static SelfHelpError SelfHelpError(string code = default, string errorType = default, string message = default, IEnumerable<SelfHelpError> details = default)
         {
-            details ??= new List<SelfHelpError>();
+            details ??= new ChangeTrackingList<SelfHelpError>();
 
-            return new SelfHelpError(code, errorType, message, details?.ToList(), serializedAdditionalRawData: null);
+            return new SelfHelpError(code, errorType, message, details.ToList(), additionalBinaryDataProperties: null);
         }
 
-        /// <summary> Initializes a new instance of <see cref="SelfHelp.SelfHelpSolutionData"/>. </summary>
-        /// <param name="id"> The id. </param>
-        /// <param name="name"> The name. </param>
-        /// <param name="resourceType"> The resourceType. </param>
-        /// <param name="systemData"> The systemData. </param>
+        /// <param name="id"> Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. </param>
+        /// <param name="name"> The name of the resource. </param>
+        /// <param name="resourceType"> The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts". </param>
+        /// <param name="systemData"> Azure Resource Manager metadata containing createdBy and modifiedBy information. </param>
         /// <param name="triggerCriteria"> Solution request trigger criteria. </param>
         /// <param name="parameters"> Client input parameters to run Solution. </param>
         /// <param name="solutionId"> Solution Id to identify single solution. </param>
@@ -97,29 +107,27 @@ public static SelfHelpError SelfHelpError(string code = null, string errorType =
         /// <param name="replacementMaps"> Solution replacement maps. </param>
         /// <param name="sections"> List of section object. </param>
         /// <returns> A new <see cref="SelfHelp.SelfHelpSolutionData"/> instance for mocking. </returns>
-        public static SelfHelpSolutionData SelfHelpSolutionData(ResourceIdentifier id = null, string name = null, ResourceType resourceType = default, SystemData systemData = null, IEnumerable<SolutionTriggerCriterion> triggerCriteria = null, IDictionary<string, string> parameters = null, string solutionId = null, SolutionProvisioningState? provisioningState = null, string title = null, string content = null, SolutionReplacementMaps replacementMaps = null, IEnumerable<SelfHelpSection> sections = null)
+        public static SelfHelpSolutionData SelfHelpSolutionData(ResourceIdentifier id = default, string name = default, ResourceType resourceType = default, SystemData systemData = default, IEnumerable<SolutionTriggerCriterion> triggerCriteria = default, IDictionary<string, string> parameters = default, string solutionId = default, SolutionProvisioningState? provisioningState = default, string title = default, string content = default, SolutionReplacementMaps replacementMaps = default, IEnumerable<SelfHelpSection> sections = default)
         {
-            triggerCriteria ??= new List<SolutionTriggerCriterion>();
-            parameters ??= new Dictionary<string, string>();
-            sections ??= new List<SelfHelpSection>();
-
             return new SelfHelpSolutionData(
                 id,
                 name,
                 resourceType,
                 systemData,
-                triggerCriteria?.ToList(),
-                parameters,
-                solutionId,
-                provisioningState,
-                title,
-                content,
-                replacementMaps,
-                sections?.ToList(),
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="Models.SolutionReplacementMaps"/>. </summary>
+                additionalBinaryDataProperties: null,
+                triggerCriteria is null && parameters is null && solutionId is null && provisioningState is null && title is null && content is null && replacementMaps is null && sections is null ? default : new SolutionResourceProperties(
+                    (triggerCriteria ?? new ChangeTrackingList<SolutionTriggerCriterion>()).ToList(),
+                    parameters,
+                    solutionId,
+                    provisioningState,
+                    title,
+                    content,
+                    replacementMaps,
+                    (sections ?? new ChangeTrackingList<SelfHelpSection>()).ToList(),
+                    null));
+        }
+
+        /// <summary> Solution replacement maps. </summary>
         /// <param name="webResults"> Solution AzureKB results. </param>
         /// <param name="diagnostics"> Solution diagnostics results. </param>
         /// <param name="troubleshooters"> Solutions Troubleshooters. </param>
@@ -127,37 +135,37 @@ public static SelfHelpSolutionData SelfHelpSolutionData(ResourceIdentifier id =
         /// <param name="videos"> Video solutions, which have the power to engage the customer by stimulating their senses. </param>
         /// <param name="videoGroups"> Group of Videos. </param>
         /// <returns> A new <see cref="Models.SolutionReplacementMaps"/> instance for mocking. </returns>
-        public static SolutionReplacementMaps SolutionReplacementMaps(IEnumerable<KBWebResult> webResults = null, IEnumerable<SolutionsDiagnostic> diagnostics = null, IEnumerable<SolutionsTroubleshooters> troubleshooters = null, IEnumerable<MetricsBasedChart> metricsBasedCharts = null, IEnumerable<SelfHelpVideo> videos = null, IEnumerable<VideoGroupDetail> videoGroups = null)
+        public static SolutionReplacementMaps SolutionReplacementMaps(IEnumerable<KBWebResult> webResults = default, IEnumerable<SolutionsDiagnostic> diagnostics = default, IEnumerable<SolutionsTroubleshooters> troubleshooters = default, IEnumerable<MetricsBasedChart> metricsBasedCharts = default, IEnumerable<SelfHelpVideo> videos = default, IEnumerable<VideoGroupDetail> videoGroups = default)
         {
-            webResults ??= new List<KBWebResult>();
-            diagnostics ??= new List<SolutionsDiagnostic>();
-            troubleshooters ??= new List<SolutionsTroubleshooters>();
-            metricsBasedCharts ??= new List<MetricsBasedChart>();
-            videos ??= new List<SelfHelpVideo>();
-            videoGroups ??= new List<VideoGroupDetail>();
+            webResults ??= new ChangeTrackingList<KBWebResult>();
+            diagnostics ??= new ChangeTrackingList<SolutionsDiagnostic>();
+            troubleshooters ??= new ChangeTrackingList<SolutionsTroubleshooters>();
+            metricsBasedCharts ??= new ChangeTrackingList<MetricsBasedChart>();
+            videos ??= new ChangeTrackingList<SelfHelpVideo>();
+            videoGroups ??= new ChangeTrackingList<VideoGroupDetail>();
 
             return new SolutionReplacementMaps(
-                webResults?.ToList(),
-                diagnostics?.ToList(),
-                troubleshooters?.ToList(),
-                metricsBasedCharts?.ToList(),
-                videos?.ToList(),
-                videoGroups?.ToList(),
-                serializedAdditionalRawData: null);
+                webResults.ToList(),
+                diagnostics.ToList(),
+                troubleshooters.ToList(),
+                metricsBasedCharts.ToList(),
+                videos.ToList(),
+                videoGroups.ToList(),
+                additionalBinaryDataProperties: null);
         }
 
-        /// <summary> Initializes a new instance of <see cref="Models.KBWebResult"/>. </summary>
+        /// <summary> AzureKB web result. </summary>
         /// <param name="replacementKey"> Place holder used in HTML Content replace control with the content. </param>
         /// <param name="searchResults"> AzureKB search results. </param>
         /// <returns> A new <see cref="Models.KBWebResult"/> instance for mocking. </returns>
-        public static KBWebResult KBWebResult(string replacementKey = null, IEnumerable<KBSearchResult> searchResults = null)
+        public static KBWebResult KBWebResult(string replacementKey = default, IEnumerable<KBSearchResult> searchResults = default)
         {
-            searchResults ??= new List<KBSearchResult>();
+            searchResults ??= new ChangeTrackingList<KBSearchResult>();
 
-            return new KBWebResult(replacementKey, searchResults?.ToList(), serializedAdditionalRawData: null);
+            return new KBWebResult(replacementKey, searchResults.ToList(), additionalBinaryDataProperties: null);
         }
 
-        /// <summary> Initializes a new instance of <see cref="Models.KBSearchResult"/>. </summary>
+        /// <summary> Details of an AzureKB search result. </summary>
         /// <param name="solutionId"> Unique id of the result. </param>
         /// <param name="content"> Content of the search result. </param>
         /// <param name="title"> Title of the search result. </param>
@@ -167,7 +175,7 @@ public static KBWebResult KBWebResult(string replacementKey = null, IEnumerable<
         /// <param name="rank"> rank of the search result. </param>
         /// <param name="link"> Link to the document. </param>
         /// <returns> A new <see cref="Models.KBSearchResult"/> instance for mocking. </returns>
-        public static KBSearchResult KBSearchResult(string solutionId = null, string content = null, string title = null, SelfHelpConfidence? confidence = null, string source = null, KBSearchResultType? resultType = null, int? rank = null, string link = null)
+        public static KBSearchResult KBSearchResult(string solutionId = default, string content = default, string title = default, SelfHelpConfidence? confidence = default, string source = default, KBSearchResultType? resultType = default, int? rank = default, string link = default)
         {
             return new KBSearchResult(
                 solutionId,
@@ -178,10 +186,10 @@ public static KBSearchResult KBSearchResult(string solutionId = null, string con
                 resultType,
                 rank,
                 link,
-                serializedAdditionalRawData: null);
+                additionalBinaryDataProperties: null);
         }
 
-        /// <summary> Initializes a new instance of <see cref="Models.SolutionsDiagnostic"/>. </summary>
+        /// <summary> Solutions Diagnostic. </summary>
         /// <param name="solutionId"> Solution Id to identify single Solutions Diagnostic. </param>
         /// <param name="status"> Denotes the status of the diagnostic resource. </param>
         /// <param name="statusDetails"> Details of the status. </param>
@@ -190,10 +198,10 @@ public static KBSearchResult KBSearchResult(string solutionId = null, string con
         /// <param name="requiredParameters"> Required parameters of this item. </param>
         /// <param name="insights"> Diagnostic insights. </param>
         /// <returns> A new <see cref="Models.SolutionsDiagnostic"/> instance for mocking. </returns>
-        public static SolutionsDiagnostic SolutionsDiagnostic(string solutionId = null, SelfHelpDiagnosticStatus? status = null, string statusDetails = null, string replacementKey = null, string estimatedCompletionTime = null, IEnumerable<string> requiredParameters = null, IEnumerable<SelfHelpDiagnosticInsight> insights = null)
+        public static SolutionsDiagnostic SolutionsDiagnostic(string solutionId = default, SelfHelpDiagnosticStatus? status = default, string statusDetails = default, string replacementKey = default, string estimatedCompletionTime = default, IEnumerable<string> requiredParameters = default, IEnumerable<SelfHelpDiagnosticInsight> insights = default)
         {
-            requiredParameters ??= new List<string>();
-            insights ??= new List<SelfHelpDiagnosticInsight>();
+            requiredParameters ??= new ChangeTrackingList<string>();
+            insights ??= new ChangeTrackingList<SelfHelpDiagnosticInsight>();
 
             return new SolutionsDiagnostic(
                 solutionId,
@@ -201,180 +209,150 @@ public static SolutionsDiagnostic SolutionsDiagnostic(string solutionId = null,
                 statusDetails,
                 replacementKey,
                 estimatedCompletionTime,
-                requiredParameters?.ToList(),
-                insights?.ToList(),
-                serializedAdditionalRawData: null);
+                requiredParameters.ToList(),
+                insights.ToList(),
+                additionalBinaryDataProperties: null);
         }
 
-        /// <summary> Initializes a new instance of <see cref="Models.SolutionsTroubleshooters"/>. </summary>
+        /// <summary> Troubleshooters in Solutions. </summary>
         /// <param name="solutionId"> Solution Id to identify single Solutions Troubleshooter. </param>
         /// <param name="title"> Troubleshooter title. </param>
         /// <param name="summary"> Troubleshooter summary. </param>
         /// <returns> A new <see cref="Models.SolutionsTroubleshooters"/> instance for mocking. </returns>
-        public static SolutionsTroubleshooters SolutionsTroubleshooters(string solutionId = null, string title = null, string summary = null)
+        public static SolutionsTroubleshooters SolutionsTroubleshooters(string solutionId = default, string title = default, string summary = default)
         {
-            return new SolutionsTroubleshooters(solutionId, title, summary, serializedAdditionalRawData: null);
+            return new SolutionsTroubleshooters(solutionId, title, summary, additionalBinaryDataProperties: null);
         }
 
-        /// <summary> Initializes a new instance of <see cref="Models.MetricsBasedChart"/>. </summary>
         /// <param name="name"> Chart name. </param>
         /// <param name="aggregationType"> Allowed values are Sum, Avg, Count, Min, Max. Default is Sum. </param>
         /// <param name="timeSpanDuration"> Time span duration. </param>
         /// <param name="title"> Chart title. </param>
-        /// <param name="filter"> Filter group. </param>
+        /// <param name="filter"> List of filters. </param>
         /// <param name="replacementKey"> Place holder used in HTML Content replace control with the content. </param>
         /// <returns> A new <see cref="Models.MetricsBasedChart"/> instance for mocking. </returns>
-        public static MetricsBasedChart MetricsBasedChart(string name = null, ChartAggregationType? aggregationType = null, TimeSpan? timeSpanDuration = null, string title = null, IEnumerable<SelfHelpFilter> filter = null, string replacementKey = null)
+        public static MetricsBasedChart MetricsBasedChart(string name = default, ChartAggregationType? aggregationType = default, TimeSpan? timeSpanDuration = default, string title = default, IEnumerable<SelfHelpFilter> filter = default, string replacementKey = default)
         {
-            filter ??= new List<SelfHelpFilter>();
-
             return new MetricsBasedChart(
                 name,
                 aggregationType,
                 timeSpanDuration,
                 title,
-                filter != null ? new ChartFilterGroup(filter?.ToList(), serializedAdditionalRawData: null) : null,
+                filter is null ? default : new ChartFilterGroup((filter ?? new ChangeTrackingList<SelfHelpFilter>()).ToList(), null),
                 replacementKey,
-                serializedAdditionalRawData: null);
+                additionalBinaryDataProperties: null);
         }
 
-        /// <summary> Initializes a new instance of <see cref="Models.SelfHelpFilter"/>. </summary>
+        /// <summary> Filter criterion. </summary>
         /// <param name="name"> Filter name. </param>
         /// <param name="values"> Filter values. </param>
         /// <param name="operator"> Filter operator. </param>
         /// <returns> A new <see cref="Models.SelfHelpFilter"/> instance for mocking. </returns>
-        public static SelfHelpFilter SelfHelpFilter(string name = null, string values = null, string @operator = null)
+        public static SelfHelpFilter SelfHelpFilter(string name = default, string values = default, string @operator = default)
         {
-            return new SelfHelpFilter(name, values, @operator, serializedAdditionalRawData: null);
+            return new SelfHelpFilter(name, values, @operator, additionalBinaryDataProperties: null);
         }
 
-        /// <summary> Initializes a new instance of <see cref="Models.SelfHelpVideo"/>. </summary>
+        /// <summary> Video detail. </summary>
         /// <param name="src"> Link to the video. </param>
         /// <param name="title"> Title of the video. </param>
         /// <param name="replacementKey"> Place holder used in HTML Content replace control with the insight content. </param>
         /// <returns> A new <see cref="Models.SelfHelpVideo"/> instance for mocking. </returns>
-        public static SelfHelpVideo SelfHelpVideo(string src = null, string title = null, string replacementKey = null)
+        public static SelfHelpVideo SelfHelpVideo(string src = default, string title = default, string replacementKey = default)
         {
-            return new SelfHelpVideo(src, title, serializedAdditionalRawData: null, replacementKey);
+            return new SelfHelpVideo(src, title, additionalBinaryDataProperties: null, replacementKey);
         }
 
-        /// <summary> Initializes a new instance of <see cref="Models.VideoGroupVideo"/>. </summary>
+        /// <summary> VideoGroup video detail. </summary>
         /// <param name="src"> Link to the video. </param>
         /// <param name="title"> Title of the video. </param>
         /// <returns> A new <see cref="Models.VideoGroupVideo"/> instance for mocking. </returns>
-        public static VideoGroupVideo VideoGroupVideo(string src = null, string title = null)
+        public static VideoGroupVideo VideoGroupVideo(string src = default, string title = default)
         {
-            return new VideoGroupVideo(src, title, serializedAdditionalRawData: null);
+            return new VideoGroupVideo(src, title, additionalBinaryDataProperties: null);
         }
 
-        /// <summary> Initializes a new instance of <see cref="Models.VideoGroupDetail"/>. </summary>
+        /// <summary> Video group detail. </summary>
         /// <param name="videos"> List of videos will be shown to customers. </param>
         /// <param name="replacementKey"> Place holder used in HTML Content replace control with the insight content. </param>
         /// <returns> A new <see cref="Models.VideoGroupDetail"/> instance for mocking. </returns>
-        public static VideoGroupDetail VideoGroupDetail(IEnumerable<VideoGroupVideo> videos = null, string replacementKey = null)
+        public static VideoGroupDetail VideoGroupDetail(IEnumerable<VideoGroupVideo> videos = default, string replacementKey = default)
         {
-            videos ??= new List<VideoGroupVideo>();
+            videos ??= new ChangeTrackingList<VideoGroupVideo>();
 
-            return new VideoGroupDetail(videos?.ToList(), replacementKey, serializedAdditionalRawData: null);
+            return new VideoGroupDetail(videos.ToList(), replacementKey, additionalBinaryDataProperties: null);
         }
 
-        /// <summary> Initializes a new instance of <see cref="Models.SelfHelpSection"/>. </summary>
+        /// <summary> Part of the solution and are dividers in the solution rendering. </summary>
         /// <param name="title"> Solution sections title. </param>
         /// <param name="content"> Solution sections content. </param>
         /// <param name="replacementMaps"> Solution replacement maps. </param>
         /// <returns> A new <see cref="Models.SelfHelpSection"/> instance for mocking. </returns>
-        public static SelfHelpSection SelfHelpSection(string title = null, string content = null, SolutionReplacementMaps replacementMaps = null)
+        public static SelfHelpSection SelfHelpSection(string title = default, string content = default, SolutionReplacementMaps replacementMaps = default)
         {
-            return new SelfHelpSection(title, content, replacementMaps, serializedAdditionalRawData: null);
+            return new SelfHelpSection(title, content, replacementMaps, additionalBinaryDataProperties: null);
         }
 
-        /// <summary> Initializes a new instance of <see cref="Models.SelfHelpSolutionPatch"/>. </summary>
-        /// <param name="triggerCriteria"> Solution request trigger criteria. </param>
-        /// <param name="parameters"> Client input parameters to run Solution. </param>
-        /// <param name="solutionId"> Solution Id to identify single solution. </param>
-        /// <param name="provisioningState"> Status of solution provisioning. </param>
-        /// <param name="title"> The title. </param>
-        /// <param name="content"> The HTML content that needs to be rendered and shown to customer. </param>
-        /// <param name="replacementMaps"> Solution replacement maps. </param>
-        /// <param name="sections"> List of section object. </param>
-        /// <returns> A new <see cref="Models.SelfHelpSolutionPatch"/> instance for mocking. </returns>
-        public static SelfHelpSolutionPatch SelfHelpSolutionPatch(IEnumerable<SolutionTriggerCriterion> triggerCriteria = null, IDictionary<string, string> parameters = null, string solutionId = null, SolutionProvisioningState? provisioningState = null, string title = null, string content = null, SolutionReplacementMaps replacementMaps = null, IEnumerable<SelfHelpSection> sections = null)
+        /// <summary> Solution WarmUpRequest body. </summary>
+        /// <param name="parameters"> Dictionary of &lt;string&gt;. </param>
+        /// <returns> A new <see cref="Models.SolutionWarmUpContent"/> instance for mocking. </returns>
+        public static SolutionWarmUpContent SolutionWarmUpContent(IDictionary<string, string> parameters = default)
         {
-            triggerCriteria ??= new List<SolutionTriggerCriterion>();
-            parameters ??= new Dictionary<string, string>();
-            sections ??= new List<SelfHelpSection>();
+            parameters ??= new ChangeTrackingDictionary<string, string>();
 
-            return new SelfHelpSolutionPatch(
-                triggerCriteria?.ToList(),
-                parameters,
-                solutionId,
-                provisioningState,
-                title,
-                content,
-                replacementMaps,
-                sections?.ToList(),
-                serializedAdditionalRawData: null);
+            return new SolutionWarmUpContent(parameters, additionalBinaryDataProperties: null);
         }
 
-        /// <summary> Initializes a new instance of <see cref="SelfHelp.SelfHelpSimplifiedSolutionData"/>. </summary>
-        /// <param name="id"> The id. </param>
-        /// <param name="name"> The name. </param>
-        /// <param name="resourceType"> The resourceType. </param>
-        /// <param name="systemData"> The systemData. </param>
+        /// <param name="id"> Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. </param>
+        /// <param name="name"> The name of the resource. </param>
+        /// <param name="resourceType"> The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts". </param>
+        /// <param name="systemData"> Azure Resource Manager metadata containing createdBy and modifiedBy information. </param>
         /// <param name="solutionId"> Solution Id to identify single Simplified Solution. </param>
         /// <param name="parameters"> Client input parameters to run Simplified Solutions. </param>
         /// <param name="title"> The title. </param>
         /// <param name="appendix"> Additional parameter response for Simplified Solutions. </param>
         /// <param name="content"> The HTML content that needs to be rendered and shown to customer. </param>
         /// <param name="provisioningState"> Status of Simplified Solution provisioning. </param>
-        /// <returns> A new <see cref="SelfHelp.SelfHelpSimplifiedSolutionData"/> instance for mocking. </returns>
-        public static SelfHelpSimplifiedSolutionData SelfHelpSimplifiedSolutionData(ResourceIdentifier id = null, string name = null, ResourceType resourceType = default, SystemData systemData = null, string solutionId = null, IDictionary<string, string> parameters = null, string title = null, IReadOnlyDictionary<string, string> appendix = null, string content = null, SolutionProvisioningState? provisioningState = null)
+        /// <returns> A new <see cref="SelfHelp.SelfHelpSimplifiedSolutionsData"/> instance for mocking. </returns>
+        public static SelfHelpSimplifiedSolutionsData SelfHelpSimplifiedSolutionsData(ResourceIdentifier id = default, string name = default, ResourceType resourceType = default, SystemData systemData = default, string solutionId = default, IDictionary<string, string> parameters = default, string title = default, IReadOnlyDictionary<string, string> appendix = default, string content = default, SolutionProvisioningState? provisioningState = default)
         {
-            parameters ??= new Dictionary<string, string>();
-            appendix ??= new Dictionary<string, string>();
-
-            return new SelfHelpSimplifiedSolutionData(
+            return new SelfHelpSimplifiedSolutionsData(
                 id,
                 name,
                 resourceType,
                 systemData,
-                solutionId,
-                parameters,
-                title,
-                appendix,
-                content,
-                provisioningState,
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SelfHelp.SelfHelpTroubleshooterData"/>. </summary>
-        /// <param name="id"> The id. </param>
-        /// <param name="name"> The name. </param>
-        /// <param name="resourceType"> The resourceType. </param>
-        /// <param name="systemData"> The systemData. </param>
+                additionalBinaryDataProperties: null,
+                solutionId is null && parameters is null && title is null && appendix is null && content is null && provisioningState is null ? default : new SimplifiedSolutionsResourceProperties(
+                    solutionId,
+                    parameters,
+                    title,
+                    appendix,
+                    content,
+                    provisioningState,
+                    null));
+        }
+
+        /// <param name="id"> Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. </param>
+        /// <param name="name"> The name of the resource. </param>
+        /// <param name="resourceType"> The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts". </param>
+        /// <param name="systemData"> Azure Resource Manager metadata containing createdBy and modifiedBy information. </param>
         /// <param name="solutionId"> Solution Id to identify single troubleshooter. </param>
         /// <param name="parameters"> Client input parameters to run Troubleshooter Resource. </param>
         /// <param name="provisioningState"> Status of troubleshooter provisioning. </param>
         /// <param name="steps"> List of step object. </param>
         /// <returns> A new <see cref="SelfHelp.SelfHelpTroubleshooterData"/> instance for mocking. </returns>
-        public static SelfHelpTroubleshooterData SelfHelpTroubleshooterData(ResourceIdentifier id = null, string name = null, ResourceType resourceType = default, SystemData systemData = null, string solutionId = null, IDictionary<string, string> parameters = null, TroubleshooterProvisioningState? provisioningState = null, IEnumerable<SelfHelpStep> steps = null)
+        public static SelfHelpTroubleshooterData SelfHelpTroubleshooterData(ResourceIdentifier id = default, string name = default, ResourceType resourceType = default, SystemData systemData = default, string solutionId = default, IDictionary<string, string> parameters = default, TroubleshooterProvisioningState? provisioningState = default, IEnumerable<SelfHelpStep> steps = default)
         {
-            parameters ??= new Dictionary<string, string>();
-            steps ??= new List<SelfHelpStep>();
-
             return new SelfHelpTroubleshooterData(
                 id,
                 name,
                 resourceType,
                 systemData,
-                solutionId,
-                parameters,
-                provisioningState,
-                steps?.ToList(),
-                serializedAdditionalRawData: null);
+                additionalBinaryDataProperties: null,
+                solutionId is null && parameters is null && provisioningState is null && steps is null ? default : new TroubleshooterInstanceProperties(solutionId, parameters, provisioningState, (steps ?? new ChangeTrackingList<SelfHelpStep>()).ToList(), null));
         }
 
-        /// <summary> Initializes a new instance of <see cref="Models.SelfHelpStep"/>. </summary>
+        /// <summary> Troubleshooter step. </summary>
         /// <param name="id"> Unique step id. </param>
         /// <param name="title"> Step title. </param>
         /// <param name="description"> Step description. </param>
@@ -388,10 +366,10 @@ public static SelfHelpTroubleshooterData SelfHelpTroubleshooterData(ResourceIden
         /// <param name="insights"></param>
         /// <param name="error"> The error detail. </param>
         /// <returns> A new <see cref="Models.SelfHelpStep"/> instance for mocking. </returns>
-        public static SelfHelpStep SelfHelpStep(string id = null, string title = null, string description = null, string guidance = null, TroubleshooterExecutionStatus? executionStatus = null, string executionStatusDescription = null, SelfHelpType? stepType = null, bool? isLastStep = null, IEnumerable<TroubleshooterStepInput> inputs = null, AutomatedCheckResult automatedCheckResults = null, IEnumerable<SelfHelpDiagnosticInsight> insights = null, ResponseError error = null)
+        public static SelfHelpStep SelfHelpStep(string id = default, string title = default, string description = default, string guidance = default, TroubleshooterExecutionStatus? executionStatus = default, string executionStatusDescription = default, SelfHelpType? stepType = default, bool? isLastStep = default, IEnumerable<TroubleshooterStepInput> inputs = default, AutomatedCheckResult automatedCheckResults = default, IEnumerable<SelfHelpDiagnosticInsight> insights = default, ResponseError error = default)
         {
-            inputs ??= new List<TroubleshooterStepInput>();
-            insights ??= new List<SelfHelpDiagnosticInsight>();
+            inputs ??= new ChangeTrackingList<TroubleshooterStepInput>();
+            insights ??= new ChangeTrackingList<SelfHelpDiagnosticInsight>();
 
             return new SelfHelpStep(
                 id,
@@ -402,14 +380,14 @@ public static SelfHelpStep SelfHelpStep(string id = null, string title = null, s
                 executionStatusDescription,
                 stepType,
                 isLastStep,
-                inputs?.ToList(),
+                inputs.ToList(),
                 automatedCheckResults,
-                insights?.ToList(),
+                insights.ToList(),
                 error,
-                serializedAdditionalRawData: null);
+                additionalBinaryDataProperties: null);
         }
 
-        /// <summary> Initializes a new instance of <see cref="Models.TroubleshooterStepInput"/>. </summary>
+        /// <summary> Details of step input. </summary>
         /// <param name="questionId"> Use Index as QuestionId. </param>
         /// <param name="questionType"> Type of Question. </param>
         /// <param name="questionTitle"> Question title. </param>
@@ -421,9 +399,9 @@ public static SelfHelpStep SelfHelpStep(string id = null, string title = null, s
         /// <param name="responseValidationProperties"> Troubleshooter step input response validation properties. </param>
         /// <param name="responseOptions"></param>
         /// <returns> A new <see cref="Models.TroubleshooterStepInput"/> instance for mocking. </returns>
-        public static TroubleshooterStepInput TroubleshooterStepInput(string questionId = null, TroubleshooterQuestionType? questionType = null, string questionTitle = null, string questionContent = null, TroubleshooterQuestionContentType? questionContentType = null, string responseHint = null, string recommendedOption = null, string selectedOptionValue = null, ResponseValidationProperties responseValidationProperties = null, IEnumerable<ResponseConfig> responseOptions = null)
+        public static TroubleshooterStepInput TroubleshooterStepInput(string questionId = default, TroubleshooterQuestionType? questionType = default, string questionTitle = default, string questionContent = default, TroubleshooterQuestionContentType? questionContentType = default, string responseHint = default, string recommendedOption = default, string selectedOptionValue = default, ResponseValidationProperties responseValidationProperties = default, IEnumerable<ResponseConfig> responseOptions = default)
         {
-            responseOptions ??= new List<ResponseConfig>();
+            responseOptions ??= new ChangeTrackingList<ResponseConfig>();
 
             return new TroubleshooterStepInput(
                 questionId,
@@ -435,18 +413,18 @@ public static TroubleshooterStepInput TroubleshooterStepInput(string questionId
                 recommendedOption,
                 selectedOptionValue,
                 responseValidationProperties,
-                responseOptions?.ToList(),
-                serializedAdditionalRawData: null);
+                responseOptions.ToList(),
+                additionalBinaryDataProperties: null);
         }
 
-        /// <summary> Initializes a new instance of <see cref="Models.ResponseValidationProperties"/>. </summary>
+        /// <summary> Troubleshooter step input response validation properties. </summary>
         /// <param name="regex"> Regex used for the input validation. </param>
         /// <param name="validationScope"> Validation scope. </param>
         /// <param name="isRequired"> Default True. </param>
         /// <param name="validationErrorMessage"> Validation Error Message. </param>
         /// <param name="maxLength"> Max text input (open Ended Text). </param>
         /// <returns> A new <see cref="Models.ResponseValidationProperties"/> instance for mocking. </returns>
-        public static ResponseValidationProperties ResponseValidationProperties(string regex = null, TroubleshooterValidationScope? validationScope = null, bool? isRequired = null, string validationErrorMessage = null, long? maxLength = null)
+        public static ResponseValidationProperties ResponseValidationProperties(string regex = default, TroubleshooterValidationScope? validationScope = default, bool? isRequired = default, string validationErrorMessage = default, long? maxLength = default)
         {
             return new ResponseValidationProperties(
                 regex,
@@ -454,53 +432,73 @@ public static ResponseValidationProperties ResponseValidationProperties(string r
                 isRequired,
                 validationErrorMessage,
                 maxLength,
-                serializedAdditionalRawData: null);
+                additionalBinaryDataProperties: null);
         }
 
-        /// <summary> Initializes a new instance of <see cref="Models.ResponseConfig"/>. </summary>
+        /// <summary> The status of the resource. </summary>
         /// <param name="key"> Unique string. </param>
         /// <param name="value"> Option description. </param>
         /// <returns> A new <see cref="Models.ResponseConfig"/> instance for mocking. </returns>
-        public static ResponseConfig ResponseConfig(string key = null, string value = null)
+        public static ResponseConfig ResponseConfig(string key = default, string value = default)
         {
-            return new ResponseConfig(key, value, serializedAdditionalRawData: null);
+            return new ResponseConfig(key, value, additionalBinaryDataProperties: null);
         }
 
-        /// <summary> Initializes a new instance of <see cref="Models.AutomatedCheckResult"/>. </summary>
+        /// <summary> Only for AutomatedStep type. </summary>
         /// <param name="version"> Version for automated check result. </param>
         /// <param name="status"> Status for automated check result. </param>
         /// <param name="result"> Insight Article Content. </param>
         /// <param name="resultType"> Type of Result. </param>
         /// <returns> A new <see cref="Models.AutomatedCheckResult"/> instance for mocking. </returns>
-        public static AutomatedCheckResult AutomatedCheckResult(string version = null, string status = null, string result = null, AutomatedCheckResultType? resultType = null)
+        public static AutomatedCheckResult AutomatedCheckResult(string version = default, string status = default, string result = default, AutomatedCheckResultType? resultType = default)
         {
-            return new AutomatedCheckResult(version, status, result, resultType, serializedAdditionalRawData: null);
+            return new AutomatedCheckResult(version, status, result, resultType, additionalBinaryDataProperties: null);
         }
 
-        /// <summary> Initializes a new instance of <see cref="Models.RestartTroubleshooterResult"/>. </summary>
+        /// <summary> Troubleshooter ContinueRequest body. </summary>
+        /// <param name="stepId"> Unique id of the result. </param>
+        /// <param name="responses"></param>
+        /// <returns> A new <see cref="Models.TroubleshooterContinueContent"/> instance for mocking. </returns>
+        public static TroubleshooterContinueContent TroubleshooterContinueContent(string stepId = default, IEnumerable<TroubleshooterResult> responses = default)
+        {
+            responses ??= new ChangeTrackingList<TroubleshooterResult>();
+
+            return new TroubleshooterContinueContent(stepId, responses.ToList(), additionalBinaryDataProperties: null);
+        }
+
+        /// <summary> Troubleshooter restart response. </summary>
         /// <param name="troubleshooterResourceName"> Updated TroubleshooterResource Name . </param>
         /// <returns> A new <see cref="Models.RestartTroubleshooterResult"/> instance for mocking. </returns>
-        public static RestartTroubleshooterResult RestartTroubleshooterResult(string troubleshooterResourceName = null)
+        public static RestartTroubleshooterResult RestartTroubleshooterResult(string troubleshooterResourceName = default)
         {
-            return new RestartTroubleshooterResult(troubleshooterResourceName, serializedAdditionalRawData: null);
+            return new RestartTroubleshooterResult(troubleshooterResourceName, additionalBinaryDataProperties: null);
         }
 
-        /// <summary> Initializes a new instance of <see cref="Models.DiscoveryNlpContent"/>. </summary>
+        /// <summary> Discover NLP request. </summary>
         /// <param name="issueSummary"> Natural language description of the issue. </param>
         /// <param name="resourceId"> ARM resource Id of the resource that is having the issue. Only applicable for Discovery Solution NLP Subscription Scope. </param>
         /// <param name="serviceId"> ARM service Id of the service that is having the issue. For more information on service Id see https://learn.microsoft.com/rest/api/support/services/list?tabs=HTTP. </param>
         /// <param name="additionalContext"> Additional information in the form of a string. </param>
         /// <returns> A new <see cref="Models.DiscoveryNlpContent"/> instance for mocking. </returns>
-        public static DiscoveryNlpContent DiscoveryNlpContent(string issueSummary = null, string resourceId = null, string serviceId = null, string additionalContext = null)
+        public static DiscoveryNlpContent DiscoveryNlpContent(string issueSummary = default, string resourceId = default, string serviceId = default, string additionalContext = default)
         {
-            return new DiscoveryNlpContent(issueSummary, resourceId, serviceId, additionalContext, serializedAdditionalRawData: null);
+            return new DiscoveryNlpContent(issueSummary, resourceId, serviceId, additionalContext, additionalBinaryDataProperties: null);
         }
 
-        /// <summary> Initializes a new instance of <see cref="Models.SolutionNlpMetadata"/>. </summary>
-        /// <param name="id"> The id. </param>
-        /// <param name="name"> The name. </param>
-        /// <param name="resourceType"> The resourceType. </param>
-        /// <param name="systemData"> The systemData. </param>
+        /// <summary> Successfully fetched list of solution metadata. </summary>
+        /// <param name="value"> The list of solution metadata. </param>
+        /// <returns> A new <see cref="Models.DiscoveryNlpResult"/> instance for mocking. </returns>
+        public static DiscoveryNlpResult DiscoveryNlpResult(IEnumerable<SolutionNlpMetadata> value = default)
+        {
+            value ??= new ChangeTrackingList<SolutionNlpMetadata>();
+
+            return new DiscoveryNlpResult(value.ToList(), additionalBinaryDataProperties: null);
+        }
+
+        /// <param name="id"> Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. </param>
+        /// <param name="name"> The name of the resource. </param>
+        /// <param name="resourceType"> The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts". </param>
+        /// <param name="systemData"> Azure Resource Manager metadata containing createdBy and modifiedBy information. </param>
         /// <param name="problemTitle"> Title of the problem classification. </param>
         /// <param name="problemDescription"> Description of the problem classification. </param>
         /// <param name="serviceId"> Id of the service (https://learn.microsoft.com/en-us/rest/api/support/services?view=rest-support-2020-04-01) that may be used to create a support ticket. </param>
@@ -508,130 +506,115 @@ public static DiscoveryNlpContent DiscoveryNlpContent(string issueSummary = null
         /// <param name="solutions"> The list of solution metadata. </param>
         /// <param name="relatedServices"> The set of services that are most likely related to the request. If relatedServices is included in the response then solutions may not be discovered until the client calls a second time specifying one of the service Ids in the relatedServices object. </param>
         /// <returns> A new <see cref="Models.SolutionNlpMetadata"/> instance for mocking. </returns>
-        public static SolutionNlpMetadata SolutionNlpMetadata(ResourceIdentifier id = null, string name = null, ResourceType resourceType = default, SystemData systemData = null, string problemTitle = null, string problemDescription = null, string serviceId = null, string problemClassificationId = null, IEnumerable<SolutionMetadataProperties> solutions = null, IEnumerable<ClassificationService> relatedServices = null)
+        public static SolutionNlpMetadata SolutionNlpMetadata(ResourceIdentifier id = default, string name = default, ResourceType resourceType = default, SystemData systemData = default, string problemTitle = default, string problemDescription = default, string serviceId = default, string problemClassificationId = default, IEnumerable<SolutionMetadataProperties> solutions = default, IEnumerable<ClassificationService> relatedServices = default)
         {
-            solutions ??= new List<SolutionMetadataProperties>();
-            relatedServices ??= new List<ClassificationService>();
-
             return new SolutionNlpMetadata(
                 id,
                 name,
                 resourceType,
                 systemData,
-                problemTitle,
-                problemDescription,
-                serviceId,
-                problemClassificationId,
-                solutions?.ToList(),
-                relatedServices?.ToList(),
-                serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="Models.SolutionMetadataProperties"/>. </summary>
+                additionalBinaryDataProperties: null,
+                problemTitle is null && problemDescription is null && serviceId is null && problemClassificationId is null && solutions is null && relatedServices is null ? default : new SelfHelpNlpSolutions(
+                    problemTitle,
+                    problemDescription,
+                    serviceId,
+                    problemClassificationId,
+                    (solutions ?? new ChangeTrackingList<SolutionMetadataProperties>()).ToList(),
+                    (relatedServices ?? new ChangeTrackingList<ClassificationService>()).ToList(),
+                    null));
+        }
+
+        /// <summary> Metadata Properties. </summary>
         /// <param name="solutionId"> Solution Id. </param>
         /// <param name="solutionType"> Solution Type. </param>
         /// <param name="description"> A detailed description of solution. </param>
         /// <param name="requiredInputs"> Required parameters for invoking this particular solution. </param>
         /// <returns> A new <see cref="Models.SolutionMetadataProperties"/> instance for mocking. </returns>
-        public static SolutionMetadataProperties SolutionMetadataProperties(string solutionId = null, SelfHelpSolutionType? solutionType = null, string description = null, IEnumerable<string> requiredInputs = null)
+        public static SolutionMetadataProperties SolutionMetadataProperties(string solutionId = default, SelfHelpSolutionType? solutionType = default, string description = default, IEnumerable<string> requiredInputs = default)
         {
-            requiredInputs ??= new List<string>();
+            requiredInputs ??= new ChangeTrackingList<string>();
 
-            return new SolutionMetadataProperties(solutionId, solutionType, description, requiredInputs?.ToList(), serializedAdditionalRawData: null);
+            return new SolutionMetadataProperties(solutionId, solutionType, description, requiredInputs.ToList(), additionalBinaryDataProperties: null);
         }
 
-        /// <summary> Initializes a new instance of <see cref="Models.ClassificationService"/>. </summary>
+        /// <summary> Service Classification result object. </summary>
         /// <param name="serviceId"> Azure resource Id of the service. </param>
         /// <param name="displayName"> Localized name of the azure service. </param>
         /// <param name="resourceTypes"> List of applicable ARM resource types for this service. </param>
         /// <returns> A new <see cref="Models.ClassificationService"/> instance for mocking. </returns>
-        public static ClassificationService ClassificationService(ResourceIdentifier serviceId = null, string displayName = null, IEnumerable<string> resourceTypes = null)
+        public static ClassificationService ClassificationService(ResourceIdentifier serviceId = default, string displayName = default, IEnumerable<string> resourceTypes = default)
         {
-            resourceTypes ??= new List<string>();
+            resourceTypes ??= new ChangeTrackingList<string>();
 
-            return new ClassificationService(serviceId, displayName, resourceTypes?.ToList(), serializedAdditionalRawData: null);
+            return new ClassificationService(serviceId, displayName, resourceTypes.ToList(), additionalBinaryDataProperties: null);
         }
 
-        /// <summary> Initializes a new instance of <see cref="Models.SelfHelpSolutionResult"/>. </summary>
-        /// <param name="id"> The id. </param>
-        /// <param name="name"> The name. </param>
-        /// <param name="resourceType"> The resourceType. </param>
-        /// <param name="systemData"> The systemData. </param>
+        /// <param name="id"> Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. </param>
+        /// <param name="name"> The name of the resource. </param>
+        /// <param name="resourceType"> The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts". </param>
+        /// <param name="systemData"> Azure Resource Manager metadata containing createdBy and modifiedBy information. </param>
         /// <param name="solutionId"> SolutionId is a unique id to identify a solution. You can retrieve the solution id using the Discovery api - https://learn.microsoft.com/en-us/rest/api/help/discovery-solution/list?view=rest-help-2023-09-01-preview&amp;tabs=HTTP. </param>
         /// <param name="title"> The title. </param>
         /// <param name="content"> The HTML content that needs to be rendered and shown to customer. </param>
         /// <param name="replacementMaps"> Solution replacement maps. </param>
         /// <param name="sections"> List of section object. </param>
-        /// <returns> A new <see cref="Models.SelfHelpSolutionResult"/> instance for mocking. </returns>
-        public static SelfHelpSolutionResult SelfHelpSolutionResult(ResourceIdentifier id = null, string name = null, ResourceType resourceType = default, SystemData systemData = null, string solutionId = null, string title = null, string content = null, ReplacementMapsResult replacementMaps = null, IEnumerable<SolutionSection> sections = null)
+        /// <returns> A new <see cref="SelfHelp.SelfHelpSolutionResultData"/> instance for mocking. </returns>
+        public static SelfHelpSolutionResultData SelfHelpSolutionResultData(ResourceIdentifier id = default, string name = default, ResourceType resourceType = default, SystemData systemData = default, string solutionId = default, string title = default, string content = default, ReplacementMapsResult replacementMaps = default, IEnumerable<SolutionSection> sections = default)
         {
-            sections ??= new List<SolutionSection>();
-
-            return new SelfHelpSolutionResult(
+            return new SelfHelpSolutionResultData(
                 id,
                 name,
                 resourceType,
                 systemData,
-                solutionId,
-                title,
-                content,
-                replacementMaps,
-                sections?.ToList(),
-                serializedAdditionalRawData: null);
+                additionalBinaryDataProperties: null,
+                solutionId is null && title is null && content is null && replacementMaps is null && sections is null ? default : new SolutionsResourcePropertiesSelfHelp(
+                    solutionId,
+                    title,
+                    content,
+                    replacementMaps,
+                    (sections ?? new ChangeTrackingList<SolutionSection>()).ToList(),
+                    null));
         }
 
-        /// <summary> Initializes a new instance of <see cref="Models.ReplacementMapsResult"/>. </summary>
+        /// <summary> Solution replacement maps. </summary>
         /// <param name="webResults"> Solution AzureKB results. </param>
         /// <param name="videos"> Video solutions, which have the power to engage the customer by stimulating their senses. </param>
         /// <param name="videoGroups"> Group of Videos. </param>
         /// <returns> A new <see cref="Models.ReplacementMapsResult"/> instance for mocking. </returns>
-        public static ReplacementMapsResult ReplacementMapsResult(IEnumerable<KBWebResult> webResults = null, IEnumerable<SelfHelpVideo> videos = null, IEnumerable<VideoGroupDetail> videoGroups = null)
+        public static ReplacementMapsResult ReplacementMapsResult(IEnumerable<KBWebResult> webResults = default, IEnumerable<SelfHelpVideo> videos = default, IEnumerable<VideoGroupDetail> videoGroups = default)
         {
-            webResults ??= new List<KBWebResult>();
-            videos ??= new List<SelfHelpVideo>();
-            videoGroups ??= new List<VideoGroupDetail>();
+            webResults ??= new ChangeTrackingList<KBWebResult>();
+            videos ??= new ChangeTrackingList<SelfHelpVideo>();
+            videoGroups ??= new ChangeTrackingList<VideoGroupDetail>();
 
-            return new ReplacementMapsResult(webResults?.ToList(), videos?.ToList(), videoGroups?.ToList(), serializedAdditionalRawData: null);
+            return new ReplacementMapsResult(webResults.ToList(), videos.ToList(), videoGroups.ToList(), additionalBinaryDataProperties: null);
         }
 
-        /// <summary> Initializes a new instance of <see cref="Models.SolutionSection"/>. </summary>
+        /// <summary> Part of the solution and are dividers in the solution rendering. </summary>
         /// <param name="title"> Solution sections title. </param>
         /// <param name="content"> Solution sections content. </param>
         /// <param name="replacementMaps"> Solution replacement maps. </param>
         /// <returns> A new <see cref="Models.SolutionSection"/> instance for mocking. </returns>
-        public static SolutionSection SolutionSection(string title = null, string content = null, ReplacementMapsResult replacementMaps = null)
-        {
-            return new SolutionSection(title, content, replacementMaps, serializedAdditionalRawData: null);
-        }
-
-        /// <summary> Initializes a new instance of <see cref="Models.SelfHelpNameAvailabilityResult"/>. </summary>
-        /// <param name="isNameAvailable"> Returns true or false depending on the availability of the name. </param>
-        /// <param name="reason"> Reason for why value is not available. This field is returned if nameAvailable is false. </param>
-        /// <param name="message"> Gets an error message explaining the 'reason' value with more details. This field is returned iif nameAvailable is false. </param>
-        /// <returns> A new <see cref="Models.SelfHelpNameAvailabilityResult"/> instance for mocking. </returns>
-        public static SelfHelpNameAvailabilityResult SelfHelpNameAvailabilityResult(bool? isNameAvailable = null, string reason = null, string message = null)
+        public static SolutionSection SolutionSection(string title = default, string content = default, ReplacementMapsResult replacementMaps = default)
         {
-            return new SelfHelpNameAvailabilityResult(isNameAvailable, reason, message, serializedAdditionalRawData: null);
+            return new SolutionSection(title, content, replacementMaps, additionalBinaryDataProperties: null);
         }
 
-        /// <summary> Initializes a new instance of <see cref="Models.SelfHelpSolutionMetadata"/>. </summary>
-        /// <param name="id"> The id. </param>
-        /// <param name="name"> The name. </param>
-        /// <param name="resourceType"> The resourceType. </param>
-        /// <param name="systemData"> The systemData. </param>
+        /// <param name="id"> Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. </param>
+        /// <param name="name"> The name of the resource. </param>
+        /// <param name="resourceType"> The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts". </param>
+        /// <param name="systemData"> Azure Resource Manager metadata containing createdBy and modifiedBy information. </param>
         /// <param name="solutions"> List of metadata. </param>
         /// <returns> A new <see cref="Models.SelfHelpSolutionMetadata"/> instance for mocking. </returns>
-        public static SelfHelpSolutionMetadata SelfHelpSolutionMetadata(ResourceIdentifier id = null, string name = null, ResourceType resourceType = default, SystemData systemData = null, IEnumerable<SolutionMetadataProperties> solutions = null)
+        public static SelfHelpSolutionMetadata SelfHelpSolutionMetadata(ResourceIdentifier id = default, string name = default, ResourceType resourceType = default, SystemData systemData = default, IEnumerable<SolutionMetadataProperties> solutions = default)
         {
-            solutions ??= new List<SolutionMetadataProperties>();
-
             return new SelfHelpSolutionMetadata(
                 id,
                 name,
                 resourceType,
                 systemData,
-                solutions?.ToList(),
-                serializedAdditionalRawData: null);
+                additionalBinaryDataProperties: null,
+                solutions is null ? default : new SelfHelpSolutions((solutions ?? new ChangeTrackingList<SolutionMetadataProperties>()).ToList(), null));
         }
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/CollectionResults/DiscoverySolutionDiscoverSolutionsAsyncCollectionResultOfT.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/CollectionResults/DiscoverySolutionDiscoverSolutionsAsyncCollectionResultOfT.cs
new file mode 100644
index 000000000000..7fa88b3dc98e
--- /dev/null
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/CollectionResults/DiscoverySolutionDiscoverSolutionsAsyncCollectionResultOfT.cs
@@ -0,0 +1,81 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Azure;
+using Azure.Core;
+using Azure.Core.Pipeline;
+using Azure.ResourceManager.SelfHelp.Models;
+
+namespace Azure.ResourceManager.SelfHelp
+{
+    internal partial class DiscoverySolutionDiscoverSolutionsAsyncCollectionResultOfT : AsyncPageable<SelfHelpSolutionMetadata>
+    {
+        private readonly DiscoverySolution _client;
+        private readonly string _filter;
+        private readonly string _skiptoken;
+        private readonly RequestContext _context;
+
+        /// <summary> Initializes a new instance of DiscoverySolutionDiscoverSolutionsAsyncCollectionResultOfT, which is used to iterate over the pages of a collection. </summary>
+        /// <param name="client"> The DiscoverySolution client used to send requests. </param>
+        /// <param name="filter"> 'ProblemClassificationId' is a mandatory filter to get solutions ids. It also supports optional 'ResourceType' and 'SolutionType' filters. The [$filter](https://learn.microsoft.com/en-us/odata/webapi/first-odata-api#filter) supports only 'and', 'or' and 'eq' operators. Example: $filter=ProblemClassificationId eq '1ddda5b4-cf6c-4d4f-91ad-bc38ab0e811e'. </param>
+        /// <param name="skiptoken"> Skiptoken is only used if a previous operation returned a partial result. </param>
+        /// <param name="context"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
+        public DiscoverySolutionDiscoverSolutionsAsyncCollectionResultOfT(DiscoverySolution client, string filter, string skiptoken, RequestContext context) : base(context?.CancellationToken ?? default)
+        {
+            _client = client;
+            _filter = filter;
+            _skiptoken = skiptoken;
+            _context = context;
+        }
+
+        /// <summary> Gets the pages of DiscoverySolutionDiscoverSolutionsAsyncCollectionResultOfT as an enumerable collection. </summary>
+        /// <param name="continuationToken"> A continuation token indicating where to resume paging. </param>
+        /// <param name="pageSizeHint"> The number of items per page. </param>
+        /// <returns> The pages of DiscoverySolutionDiscoverSolutionsAsyncCollectionResultOfT as an enumerable collection. </returns>
+        public override async IAsyncEnumerable<Page<SelfHelpSolutionMetadata>> AsPages(string continuationToken, int? pageSizeHint)
+        {
+            Uri nextPage = continuationToken != null ? new Uri(continuationToken) : null;
+            while (true)
+            {
+                Response response = await GetNextResponseAsync(pageSizeHint, nextPage).ConfigureAwait(false);
+                if (response is null)
+                {
+                    yield break;
+                }
+                SelfHelpDiscoverySolutionResult result = SelfHelpDiscoverySolutionResult.FromResponse(response);
+                yield return Page<SelfHelpSolutionMetadata>.FromValues((IReadOnlyList<SelfHelpSolutionMetadata>)result.Value, nextPage?.AbsoluteUri, response);
+                nextPage = result.NextLink;
+                if (nextPage == null)
+                {
+                    yield break;
+                }
+            }
+        }
+
+        /// <summary> Get next page. </summary>
+        /// <param name="pageSizeHint"> The number of items per page. </param>
+        /// <param name="nextLink"> The next link to use for the next page of results. </param>
+        private async ValueTask<Response> GetNextResponseAsync(int? pageSizeHint, Uri nextLink)
+        {
+            HttpMessage message = nextLink != null ? _client.CreateNextDiscoverSolutionsRequest(nextLink, _filter, _skiptoken, _context) : _client.CreateDiscoverSolutionsRequest(_filter, _skiptoken, _context);
+            using DiagnosticScope scope = _client.ClientDiagnostics.CreateScope("MockableSelfHelpTenantResource.DiscoverSolutions");
+            scope.Start();
+            try
+            {
+                return await _client.Pipeline.ProcessMessageAsync(message, _context).ConfigureAwait(false);
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+    }
+}
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/CollectionResults/DiscoverySolutionDiscoverSolutionsCollectionResultOfT.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/CollectionResults/DiscoverySolutionDiscoverSolutionsCollectionResultOfT.cs
new file mode 100644
index 000000000000..1134c0b2cdf6
--- /dev/null
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/CollectionResults/DiscoverySolutionDiscoverSolutionsCollectionResultOfT.cs
@@ -0,0 +1,80 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+using Azure;
+using Azure.Core;
+using Azure.Core.Pipeline;
+using Azure.ResourceManager.SelfHelp.Models;
+
+namespace Azure.ResourceManager.SelfHelp
+{
+    internal partial class DiscoverySolutionDiscoverSolutionsCollectionResultOfT : Pageable<SelfHelpSolutionMetadata>
+    {
+        private readonly DiscoverySolution _client;
+        private readonly string _filter;
+        private readonly string _skiptoken;
+        private readonly RequestContext _context;
+
+        /// <summary> Initializes a new instance of DiscoverySolutionDiscoverSolutionsCollectionResultOfT, which is used to iterate over the pages of a collection. </summary>
+        /// <param name="client"> The DiscoverySolution client used to send requests. </param>
+        /// <param name="filter"> 'ProblemClassificationId' is a mandatory filter to get solutions ids. It also supports optional 'ResourceType' and 'SolutionType' filters. The [$filter](https://learn.microsoft.com/en-us/odata/webapi/first-odata-api#filter) supports only 'and', 'or' and 'eq' operators. Example: $filter=ProblemClassificationId eq '1ddda5b4-cf6c-4d4f-91ad-bc38ab0e811e'. </param>
+        /// <param name="skiptoken"> Skiptoken is only used if a previous operation returned a partial result. </param>
+        /// <param name="context"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
+        public DiscoverySolutionDiscoverSolutionsCollectionResultOfT(DiscoverySolution client, string filter, string skiptoken, RequestContext context) : base(context?.CancellationToken ?? default)
+        {
+            _client = client;
+            _filter = filter;
+            _skiptoken = skiptoken;
+            _context = context;
+        }
+
+        /// <summary> Gets the pages of DiscoverySolutionDiscoverSolutionsCollectionResultOfT as an enumerable collection. </summary>
+        /// <param name="continuationToken"> A continuation token indicating where to resume paging. </param>
+        /// <param name="pageSizeHint"> The number of items per page. </param>
+        /// <returns> The pages of DiscoverySolutionDiscoverSolutionsCollectionResultOfT as an enumerable collection. </returns>
+        public override IEnumerable<Page<SelfHelpSolutionMetadata>> AsPages(string continuationToken, int? pageSizeHint)
+        {
+            Uri nextPage = continuationToken != null ? new Uri(continuationToken) : null;
+            while (true)
+            {
+                Response response = GetNextResponse(pageSizeHint, nextPage);
+                if (response is null)
+                {
+                    yield break;
+                }
+                SelfHelpDiscoverySolutionResult result = SelfHelpDiscoverySolutionResult.FromResponse(response);
+                yield return Page<SelfHelpSolutionMetadata>.FromValues((IReadOnlyList<SelfHelpSolutionMetadata>)result.Value, nextPage?.AbsoluteUri, response);
+                nextPage = result.NextLink;
+                if (nextPage == null)
+                {
+                    yield break;
+                }
+            }
+        }
+
+        /// <summary> Get next page. </summary>
+        /// <param name="pageSizeHint"> The number of items per page. </param>
+        /// <param name="nextLink"> The next link to use for the next page of results. </param>
+        private Response GetNextResponse(int? pageSizeHint, Uri nextLink)
+        {
+            HttpMessage message = nextLink != null ? _client.CreateNextDiscoverSolutionsRequest(nextLink, _filter, _skiptoken, _context) : _client.CreateDiscoverSolutionsRequest(_filter, _skiptoken, _context);
+            using DiagnosticScope scope = _client.ClientDiagnostics.CreateScope("MockableSelfHelpTenantResource.DiscoverSolutions");
+            scope.Start();
+            try
+            {
+                return _client.Pipeline.ProcessMessage(message, _context);
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+    }
+}
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Extensions/MockableSelfHelpArmClient.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Extensions/MockableSelfHelpArmClient.cs
index b8db8e300bd0..3907431fa420 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Extensions/MockableSelfHelpArmClient.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Extensions/MockableSelfHelpArmClient.cs
@@ -8,454 +8,215 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
+using Azure;
 using Azure.Core;
-using Azure.Core.Pipeline;
-using Azure.ResourceManager.SelfHelp.Models;
+using Azure.ResourceManager;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Mocking
 {
-    /// <summary> A class to add extension methods to ArmClient. </summary>
+    /// <summary> A class to add extension methods to <see cref="ArmClient"/>. </summary>
     public partial class MockableSelfHelpArmClient : ArmResource
     {
-        private ClientDiagnostics _checkNameAvailabilityClientDiagnostics;
-        private CheckNameAvailabilityRestOperations _checkNameAvailabilityRestClient;
-
-        /// <summary> Initializes a new instance of the <see cref="MockableSelfHelpArmClient"/> class for mocking. </summary>
+        /// <summary> Initializes a new instance of MockableSelfHelpArmClient for mocking. </summary>
         protected MockableSelfHelpArmClient()
         {
         }
 
-        /// <summary> Initializes a new instance of the <see cref="MockableSelfHelpArmClient"/> class. </summary>
+        /// <summary> Initializes a new instance of <see cref="MockableSelfHelpArmClient"/> class. </summary>
         /// <param name="client"> The client parameters to use in these operations. </param>
         /// <param name="id"> The identifier of the resource that is the target of operations. </param>
         internal MockableSelfHelpArmClient(ArmClient client, ResourceIdentifier id) : base(client, id)
         {
         }
 
-        internal MockableSelfHelpArmClient(ArmClient client) : this(client, ResourceIdentifier.Root)
-        {
-        }
-
-        private ClientDiagnostics CheckNameAvailabilityClientDiagnostics => _checkNameAvailabilityClientDiagnostics ??= new ClientDiagnostics("Azure.ResourceManager.SelfHelp", ProviderConstants.DefaultProviderNamespace, Diagnostics);
-        private CheckNameAvailabilityRestOperations CheckNameAvailabilityRestClient => _checkNameAvailabilityRestClient ??= new CheckNameAvailabilityRestOperations(Pipeline, Diagnostics.ApplicationId, Endpoint);
-
-        private string GetApiVersionOrNull(ResourceType resourceType)
+        /// <summary> Gets an object representing a <see cref="SelfHelpDiagnosticResource"/> along with the instance operations that can be performed on it but with no data. </summary>
+        /// <param name="id"> The resource ID of the resource to get. </param>
+        /// <returns> Returns a <see cref="SelfHelpDiagnosticResource"/> object. </returns>
+        public virtual SelfHelpDiagnosticResource GetSelfHelpDiagnosticResource(ResourceIdentifier id)
         {
-            TryGetApiVersion(resourceType, out string apiVersion);
-            return apiVersion;
+            SelfHelpDiagnosticResource.ValidateResourceId(id);
+            return new SelfHelpDiagnosticResource(Client, id);
         }
 
-        /// <summary> Gets a collection of SelfHelpDiagnosticResources in the ArmClient. </summary>
-        /// <param name="scope"> The scope that the resource will apply against. </param>
-        /// <returns> An object representing collection of SelfHelpDiagnosticResources and their operations over a SelfHelpDiagnosticResource. </returns>
+        /// <summary> Gets a collection of <see cref="SelfHelpDiagnosticCollection"/> objects within the specified scope. </summary>
+        /// <param name="scope"> The scope of the resource collection to get. </param>
+        /// <returns> Returns a collection of <see cref="SelfHelpDiagnosticResource"/> objects. </returns>
         public virtual SelfHelpDiagnosticCollection GetSelfHelpDiagnostics(ResourceIdentifier scope)
         {
             return new SelfHelpDiagnosticCollection(Client, scope);
         }
 
-        /// <summary>
-        /// Get the diagnostics using the 'diagnosticsResourceName' you chose while creating the diagnostic.
-        /// <list type="bullet">
-        /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/diagnostics/{diagnosticsResourceName}</description>
-        /// </item>
-        /// <item>
-        /// <term>Operation Id</term>
-        /// <description>DiagnosticResource_Get</description>
-        /// </item>
-        /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
-        /// </item>
-        /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpDiagnosticResource"/></description>
-        /// </item>
-        /// </list>
-        /// </summary>
-        /// <param name="scope"> The scope that the resource will apply against. </param>
+        /// <summary> Get the diagnostics using the 'diagnosticsResourceName' you chose while creating the diagnostic. </summary>
+        /// <param name="scope"> The scope of the resource collection to get. </param>
         /// <param name="diagnosticsResourceName"> Unique resource name for insight resources. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="diagnosticsResourceName"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="diagnosticsResourceName"/> is an empty string, and was expected to be non-empty. </exception>
         [ForwardsClientCalls]
-        public virtual async Task<Response<SelfHelpDiagnosticResource>> GetSelfHelpDiagnosticAsync(ResourceIdentifier scope, string diagnosticsResourceName, CancellationToken cancellationToken = default)
+        public virtual Response<SelfHelpDiagnosticResource> GetSelfHelpDiagnostic(ResourceIdentifier scope, string diagnosticsResourceName, CancellationToken cancellationToken = default)
         {
-            return await GetSelfHelpDiagnostics(scope).GetAsync(diagnosticsResourceName, cancellationToken).ConfigureAwait(false);
+            Argument.AssertNotNullOrEmpty(diagnosticsResourceName, nameof(diagnosticsResourceName));
+
+            return GetSelfHelpDiagnostics(scope).Get(diagnosticsResourceName, cancellationToken);
         }
 
-        /// <summary>
-        /// Get the diagnostics using the 'diagnosticsResourceName' you chose while creating the diagnostic.
-        /// <list type="bullet">
-        /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/diagnostics/{diagnosticsResourceName}</description>
-        /// </item>
-        /// <item>
-        /// <term>Operation Id</term>
-        /// <description>DiagnosticResource_Get</description>
-        /// </item>
-        /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
-        /// </item>
-        /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpDiagnosticResource"/></description>
-        /// </item>
-        /// </list>
-        /// </summary>
-        /// <param name="scope"> The scope that the resource will apply against. </param>
+        /// <summary> Get the diagnostics using the 'diagnosticsResourceName' you chose while creating the diagnostic. </summary>
+        /// <param name="scope"> The scope of the resource collection to get. </param>
         /// <param name="diagnosticsResourceName"> Unique resource name for insight resources. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="diagnosticsResourceName"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="diagnosticsResourceName"/> is an empty string, and was expected to be non-empty. </exception>
         [ForwardsClientCalls]
-        public virtual Response<SelfHelpDiagnosticResource> GetSelfHelpDiagnostic(ResourceIdentifier scope, string diagnosticsResourceName, CancellationToken cancellationToken = default)
+        public virtual async Task<Response<SelfHelpDiagnosticResource>> GetSelfHelpDiagnosticAsync(ResourceIdentifier scope, string diagnosticsResourceName, CancellationToken cancellationToken = default)
         {
-            return GetSelfHelpDiagnostics(scope).Get(diagnosticsResourceName, cancellationToken);
+            Argument.AssertNotNullOrEmpty(diagnosticsResourceName, nameof(diagnosticsResourceName));
+
+            return await GetSelfHelpDiagnostics(scope).GetAsync(diagnosticsResourceName, cancellationToken).ConfigureAwait(false);
         }
 
-        /// <summary> Gets a collection of SelfHelpSolutionResources in the ArmClient. </summary>
-        /// <param name="scope"> The scope that the resource will apply against. </param>
-        /// <returns> An object representing collection of SelfHelpSolutionResources and their operations over a SelfHelpSolutionResource. </returns>
+        /// <summary> Gets an object representing a <see cref="SelfHelpSolutionResource"/> along with the instance operations that can be performed on it but with no data. </summary>
+        /// <param name="id"> The resource ID of the resource to get. </param>
+        /// <returns> Returns a <see cref="SelfHelpSolutionResource"/> object. </returns>
+        public virtual SelfHelpSolutionResource GetSelfHelpSolutionResource(ResourceIdentifier id)
+        {
+            SelfHelpSolutionResource.ValidateResourceId(id);
+            return new SelfHelpSolutionResource(Client, id);
+        }
+
+        /// <summary> Gets a collection of <see cref="SelfHelpSolutionCollection"/> objects within the specified scope. </summary>
+        /// <param name="scope"> The scope of the resource collection to get. </param>
+        /// <returns> Returns a collection of <see cref="SelfHelpSolutionResource"/> objects. </returns>
         public virtual SelfHelpSolutionCollection GetSelfHelpSolutions(ResourceIdentifier scope)
         {
             return new SelfHelpSolutionCollection(Client, scope);
         }
 
-        /// <summary>
-        /// Get the solution using the applicable solutionResourceName while creating the solution.
-        /// <list type="bullet">
-        /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/solutions/{solutionResourceName}</description>
-        /// </item>
-        /// <item>
-        /// <term>Operation Id</term>
-        /// <description>SolutionResource_Get</description>
-        /// </item>
-        /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
-        /// </item>
-        /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpSolutionResource"/></description>
-        /// </item>
-        /// </list>
-        /// </summary>
-        /// <param name="scope"> The scope that the resource will apply against. </param>
+        /// <summary> Get the solution using the applicable solutionResourceName while creating the solution. </summary>
+        /// <param name="scope"> The scope of the resource collection to get. </param>
         /// <param name="solutionResourceName"> Solution resource Name. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="solutionResourceName"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="solutionResourceName"/> is an empty string, and was expected to be non-empty. </exception>
         [ForwardsClientCalls]
-        public virtual async Task<Response<SelfHelpSolutionResource>> GetSelfHelpSolutionAsync(ResourceIdentifier scope, string solutionResourceName, CancellationToken cancellationToken = default)
+        public virtual Response<SelfHelpSolutionResource> GetSelfHelpSolution(ResourceIdentifier scope, string solutionResourceName, CancellationToken cancellationToken = default)
         {
-            return await GetSelfHelpSolutions(scope).GetAsync(solutionResourceName, cancellationToken).ConfigureAwait(false);
+            Argument.AssertNotNullOrEmpty(solutionResourceName, nameof(solutionResourceName));
+
+            return GetSelfHelpSolutions(scope).Get(solutionResourceName, cancellationToken);
         }
 
-        /// <summary>
-        /// Get the solution using the applicable solutionResourceName while creating the solution.
-        /// <list type="bullet">
-        /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/solutions/{solutionResourceName}</description>
-        /// </item>
-        /// <item>
-        /// <term>Operation Id</term>
-        /// <description>SolutionResource_Get</description>
-        /// </item>
-        /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
-        /// </item>
-        /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpSolutionResource"/></description>
-        /// </item>
-        /// </list>
-        /// </summary>
-        /// <param name="scope"> The scope that the resource will apply against. </param>
+        /// <summary> Get the solution using the applicable solutionResourceName while creating the solution. </summary>
+        /// <param name="scope"> The scope of the resource collection to get. </param>
         /// <param name="solutionResourceName"> Solution resource Name. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="solutionResourceName"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="solutionResourceName"/> is an empty string, and was expected to be non-empty. </exception>
         [ForwardsClientCalls]
-        public virtual Response<SelfHelpSolutionResource> GetSelfHelpSolution(ResourceIdentifier scope, string solutionResourceName, CancellationToken cancellationToken = default)
+        public virtual async Task<Response<SelfHelpSolutionResource>> GetSelfHelpSolutionAsync(ResourceIdentifier scope, string solutionResourceName, CancellationToken cancellationToken = default)
         {
-            return GetSelfHelpSolutions(scope).Get(solutionResourceName, cancellationToken);
+            Argument.AssertNotNullOrEmpty(solutionResourceName, nameof(solutionResourceName));
+
+            return await GetSelfHelpSolutions(scope).GetAsync(solutionResourceName, cancellationToken).ConfigureAwait(false);
+        }
+
+        /// <summary> Gets an object representing a <see cref="SelfHelpSimplifiedSolutionsResource"/> along with the instance operations that can be performed on it but with no data. </summary>
+        /// <param name="id"> The resource ID of the resource to get. </param>
+        /// <returns> Returns a <see cref="SelfHelpSimplifiedSolutionsResource"/> object. </returns>
+        public virtual SelfHelpSimplifiedSolutionsResource GetSelfHelpSimplifiedSolutionsResource(ResourceIdentifier id)
+        {
+            SelfHelpSimplifiedSolutionsResource.ValidateResourceId(id);
+            return new SelfHelpSimplifiedSolutionsResource(Client, id);
         }
 
-        /// <summary> Gets a collection of SelfHelpSimplifiedSolutionResources in the ArmClient. </summary>
-        /// <param name="scope"> The scope that the resource will apply against. </param>
-        /// <returns> An object representing collection of SelfHelpSimplifiedSolutionResources and their operations over a SelfHelpSimplifiedSolutionResource. </returns>
-        public virtual SelfHelpSimplifiedSolutionCollection GetSelfHelpSimplifiedSolutions(ResourceIdentifier scope)
+        /// <summary> Gets a collection of <see cref="SelfHelpSimplifiedSolutionsCollection"/> objects within the specified scope. </summary>
+        /// <param name="scope"> The scope of the resource collection to get. </param>
+        /// <returns> Returns a collection of <see cref="SelfHelpSimplifiedSolutionsResource"/> objects. </returns>
+        public virtual SelfHelpSimplifiedSolutionsCollection GetSelfHelpSimplifiedSolutions(ResourceIdentifier scope)
         {
-            return new SelfHelpSimplifiedSolutionCollection(Client, scope);
+            return new SelfHelpSimplifiedSolutionsCollection(Client, scope);
         }
 
-        /// <summary>
-        /// Get the simplified Solutions using the applicable solutionResourceName while creating the simplified Solutions.
-        /// <list type="bullet">
-        /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/simplifiedSolutions/{simplifiedSolutionsResourceName}</description>
-        /// </item>
-        /// <item>
-        /// <term>Operation Id</term>
-        /// <description>SimplifiedSolutionsResource_Get</description>
-        /// </item>
-        /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
-        /// </item>
-        /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpSimplifiedSolutionResource"/></description>
-        /// </item>
-        /// </list>
-        /// </summary>
-        /// <param name="scope"> The scope that the resource will apply against. </param>
+        /// <summary> Get the simplified Solutions using the applicable solutionResourceName while creating the simplified Solutions. </summary>
+        /// <param name="scope"> The scope of the resource collection to get. </param>
         /// <param name="simplifiedSolutionsResourceName"> Simplified Solutions Resource Name. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="simplifiedSolutionsResourceName"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="simplifiedSolutionsResourceName"/> is an empty string, and was expected to be non-empty. </exception>
         [ForwardsClientCalls]
-        public virtual async Task<Response<SelfHelpSimplifiedSolutionResource>> GetSelfHelpSimplifiedSolutionAsync(ResourceIdentifier scope, string simplifiedSolutionsResourceName, CancellationToken cancellationToken = default)
+        public virtual Response<SelfHelpSimplifiedSolutionsResource> GetSelfHelpSimplifiedSolutions(ResourceIdentifier scope, string simplifiedSolutionsResourceName, CancellationToken cancellationToken = default)
         {
-            return await GetSelfHelpSimplifiedSolutions(scope).GetAsync(simplifiedSolutionsResourceName, cancellationToken).ConfigureAwait(false);
+            Argument.AssertNotNullOrEmpty(simplifiedSolutionsResourceName, nameof(simplifiedSolutionsResourceName));
+
+            return GetSelfHelpSimplifiedSolutions(scope).Get(simplifiedSolutionsResourceName, cancellationToken);
         }
 
-        /// <summary>
-        /// Get the simplified Solutions using the applicable solutionResourceName while creating the simplified Solutions.
-        /// <list type="bullet">
-        /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/simplifiedSolutions/{simplifiedSolutionsResourceName}</description>
-        /// </item>
-        /// <item>
-        /// <term>Operation Id</term>
-        /// <description>SimplifiedSolutionsResource_Get</description>
-        /// </item>
-        /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
-        /// </item>
-        /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpSimplifiedSolutionResource"/></description>
-        /// </item>
-        /// </list>
-        /// </summary>
-        /// <param name="scope"> The scope that the resource will apply against. </param>
+        /// <summary> Get the simplified Solutions using the applicable solutionResourceName while creating the simplified Solutions. </summary>
+        /// <param name="scope"> The scope of the resource collection to get. </param>
         /// <param name="simplifiedSolutionsResourceName"> Simplified Solutions Resource Name. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="simplifiedSolutionsResourceName"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="simplifiedSolutionsResourceName"/> is an empty string, and was expected to be non-empty. </exception>
         [ForwardsClientCalls]
-        public virtual Response<SelfHelpSimplifiedSolutionResource> GetSelfHelpSimplifiedSolution(ResourceIdentifier scope, string simplifiedSolutionsResourceName, CancellationToken cancellationToken = default)
+        public virtual async Task<Response<SelfHelpSimplifiedSolutionsResource>> GetSelfHelpSimplifiedSolutionsAsync(ResourceIdentifier scope, string simplifiedSolutionsResourceName, CancellationToken cancellationToken = default)
         {
-            return GetSelfHelpSimplifiedSolutions(scope).Get(simplifiedSolutionsResourceName, cancellationToken);
+            Argument.AssertNotNullOrEmpty(simplifiedSolutionsResourceName, nameof(simplifiedSolutionsResourceName));
+
+            return await GetSelfHelpSimplifiedSolutions(scope).GetAsync(simplifiedSolutionsResourceName, cancellationToken).ConfigureAwait(false);
         }
 
-        /// <summary> Gets a collection of SelfHelpTroubleshooterResources in the ArmClient. </summary>
-        /// <param name="scope"> The scope that the resource will apply against. </param>
-        /// <returns> An object representing collection of SelfHelpTroubleshooterResources and their operations over a SelfHelpTroubleshooterResource. </returns>
+        /// <summary> Gets an object representing a <see cref="SelfHelpTroubleshooterResource"/> along with the instance operations that can be performed on it but with no data. </summary>
+        /// <param name="id"> The resource ID of the resource to get. </param>
+        /// <returns> Returns a <see cref="SelfHelpTroubleshooterResource"/> object. </returns>
+        public virtual SelfHelpTroubleshooterResource GetSelfHelpTroubleshooterResource(ResourceIdentifier id)
+        {
+            SelfHelpTroubleshooterResource.ValidateResourceId(id);
+            return new SelfHelpTroubleshooterResource(Client, id);
+        }
+
+        /// <summary> Gets a collection of <see cref="SelfHelpTroubleshooterCollection"/> objects within the specified scope. </summary>
+        /// <param name="scope"> The scope of the resource collection to get. </param>
+        /// <returns> Returns a collection of <see cref="SelfHelpTroubleshooterResource"/> objects. </returns>
         public virtual SelfHelpTroubleshooterCollection GetSelfHelpTroubleshooters(ResourceIdentifier scope)
         {
             return new SelfHelpTroubleshooterCollection(Client, scope);
         }
 
-        /// <summary>
-        /// Gets troubleshooter instance result which includes the step status/result of the troubleshooter resource name that is being executed.&lt;br/&gt; Get API is used to retrieve the result of a Troubleshooter instance, which includes the status and result of each step in the Troubleshooter workflow. This API requires the Troubleshooter resource name that was created using the Create API.
-        /// <list type="bullet">
-        /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/troubleshooters/{troubleshooterName}</description>
-        /// </item>
-        /// <item>
-        /// <term>Operation Id</term>
-        /// <description>TroubleshooterResource_Get</description>
-        /// </item>
-        /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
-        /// </item>
-        /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpTroubleshooterResource"/></description>
-        /// </item>
-        /// </list>
-        /// </summary>
-        /// <param name="scope"> The scope that the resource will apply against. </param>
+        /// <summary> Gets troubleshooter instance result which includes the step status/result of the troubleshooter resource name that is being executed.&lt;br/&gt; Get API is used to retrieve the result of a Troubleshooter instance, which includes the status and result of each step in the Troubleshooter workflow. This API requires the Troubleshooter resource name that was created using the Create API. </summary>
+        /// <param name="scope"> The scope of the resource collection to get. </param>
         /// <param name="troubleshooterName"> Troubleshooter resource Name. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="troubleshooterName"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="troubleshooterName"/> is an empty string, and was expected to be non-empty. </exception>
         [ForwardsClientCalls]
-        public virtual async Task<Response<SelfHelpTroubleshooterResource>> GetSelfHelpTroubleshooterAsync(ResourceIdentifier scope, string troubleshooterName, CancellationToken cancellationToken = default)
+        public virtual Response<SelfHelpTroubleshooterResource> GetSelfHelpTroubleshooter(ResourceIdentifier scope, string troubleshooterName, CancellationToken cancellationToken = default)
         {
-            return await GetSelfHelpTroubleshooters(scope).GetAsync(troubleshooterName, cancellationToken).ConfigureAwait(false);
+            Argument.AssertNotNullOrEmpty(troubleshooterName, nameof(troubleshooterName));
+
+            return GetSelfHelpTroubleshooters(scope).Get(troubleshooterName, cancellationToken);
         }
 
-        /// <summary>
-        /// Gets troubleshooter instance result which includes the step status/result of the troubleshooter resource name that is being executed.&lt;br/&gt; Get API is used to retrieve the result of a Troubleshooter instance, which includes the status and result of each step in the Troubleshooter workflow. This API requires the Troubleshooter resource name that was created using the Create API.
-        /// <list type="bullet">
-        /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/troubleshooters/{troubleshooterName}</description>
-        /// </item>
-        /// <item>
-        /// <term>Operation Id</term>
-        /// <description>TroubleshooterResource_Get</description>
-        /// </item>
-        /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
-        /// </item>
-        /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpTroubleshooterResource"/></description>
-        /// </item>
-        /// </list>
-        /// </summary>
-        /// <param name="scope"> The scope that the resource will apply against. </param>
+        /// <summary> Gets troubleshooter instance result which includes the step status/result of the troubleshooter resource name that is being executed.&lt;br/&gt; Get API is used to retrieve the result of a Troubleshooter instance, which includes the status and result of each step in the Troubleshooter workflow. This API requires the Troubleshooter resource name that was created using the Create API. </summary>
+        /// <param name="scope"> The scope of the resource collection to get. </param>
         /// <param name="troubleshooterName"> Troubleshooter resource Name. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="troubleshooterName"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="troubleshooterName"/> is an empty string, and was expected to be non-empty. </exception>
         [ForwardsClientCalls]
-        public virtual Response<SelfHelpTroubleshooterResource> GetSelfHelpTroubleshooter(ResourceIdentifier scope, string troubleshooterName, CancellationToken cancellationToken = default)
-        {
-            return GetSelfHelpTroubleshooters(scope).Get(troubleshooterName, cancellationToken);
-        }
-
-        /// <summary>
-        /// This API is used to check the uniqueness of a resource name used for a diagnostic, troubleshooter or solutions
-        /// <list type="bullet">
-        /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/checkNameAvailability</description>
-        /// </item>
-        /// <item>
-        /// <term>Operation Id</term>
-        /// <description>CheckNameAvailabilityOperationGroup_CheckSelfHelpNameAvailability</description>
-        /// </item>
-        /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
-        /// </item>
-        /// </list>
-        /// </summary>
-        /// <param name="scope"> The scope that the resource will apply against. </param>
-        /// <param name="content"> The required parameters for availability check. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="scope"/> is null. </exception>
-        public virtual async Task<Response<SelfHelpNameAvailabilityResult>> CheckSelfHelpNameAvailabilityAsync(ResourceIdentifier scope, SelfHelpNameAvailabilityContent content = null, CancellationToken cancellationToken = default)
-        {
-            Argument.AssertNotNull(scope, nameof(scope));
-
-            using var scope0 = CheckNameAvailabilityClientDiagnostics.CreateScope("MockableSelfHelpArmClient.CheckSelfHelpNameAvailability");
-            scope0.Start();
-            try
-            {
-                var response = await CheckNameAvailabilityRestClient.CheckSelfHelpNameAvailabilityAsync(scope, content, cancellationToken).ConfigureAwait(false);
-                return response;
-            }
-            catch (Exception e)
-            {
-                scope0.Failed(e);
-                throw;
-            }
-        }
-
-        /// <summary>
-        /// This API is used to check the uniqueness of a resource name used for a diagnostic, troubleshooter or solutions
-        /// <list type="bullet">
-        /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/checkNameAvailability</description>
-        /// </item>
-        /// <item>
-        /// <term>Operation Id</term>
-        /// <description>CheckNameAvailabilityOperationGroup_CheckSelfHelpNameAvailability</description>
-        /// </item>
-        /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
-        /// </item>
-        /// </list>
-        /// </summary>
-        /// <param name="scope"> The scope that the resource will apply against. </param>
-        /// <param name="content"> The required parameters for availability check. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="scope"/> is null. </exception>
-        public virtual Response<SelfHelpNameAvailabilityResult> CheckSelfHelpNameAvailability(ResourceIdentifier scope, SelfHelpNameAvailabilityContent content = null, CancellationToken cancellationToken = default)
-        {
-            Argument.AssertNotNull(scope, nameof(scope));
-
-            using var scope0 = CheckNameAvailabilityClientDiagnostics.CreateScope("MockableSelfHelpArmClient.CheckSelfHelpNameAvailability");
-            scope0.Start();
-            try
-            {
-                var response = CheckNameAvailabilityRestClient.CheckSelfHelpNameAvailability(scope, content, cancellationToken);
-                return response;
-            }
-            catch (Exception e)
-            {
-                scope0.Failed(e);
-                throw;
-            }
-        }
-        /// <summary>
-        /// Gets an object representing a <see cref="SelfHelpDiagnosticResource"/> along with the instance operations that can be performed on it but with no data.
-        /// You can use <see cref="SelfHelpDiagnosticResource.CreateResourceIdentifier" /> to create a <see cref="SelfHelpDiagnosticResource"/> <see cref="ResourceIdentifier"/> from its components.
-        /// </summary>
-        /// <param name="id"> The resource ID of the resource to get. </param>
-        /// <returns> Returns a <see cref="SelfHelpDiagnosticResource"/> object. </returns>
-        public virtual SelfHelpDiagnosticResource GetSelfHelpDiagnosticResource(ResourceIdentifier id)
-        {
-            SelfHelpDiagnosticResource.ValidateResourceId(id);
-            return new SelfHelpDiagnosticResource(Client, id);
-        }
-
-        /// <summary>
-        /// Gets an object representing a <see cref="SelfHelpSolutionResource"/> along with the instance operations that can be performed on it but with no data.
-        /// You can use <see cref="SelfHelpSolutionResource.CreateResourceIdentifier" /> to create a <see cref="SelfHelpSolutionResource"/> <see cref="ResourceIdentifier"/> from its components.
-        /// </summary>
-        /// <param name="id"> The resource ID of the resource to get. </param>
-        /// <returns> Returns a <see cref="SelfHelpSolutionResource"/> object. </returns>
-        public virtual SelfHelpSolutionResource GetSelfHelpSolutionResource(ResourceIdentifier id)
+        public virtual async Task<Response<SelfHelpTroubleshooterResource>> GetSelfHelpTroubleshooterAsync(ResourceIdentifier scope, string troubleshooterName, CancellationToken cancellationToken = default)
         {
-            SelfHelpSolutionResource.ValidateResourceId(id);
-            return new SelfHelpSolutionResource(Client, id);
-        }
+            Argument.AssertNotNullOrEmpty(troubleshooterName, nameof(troubleshooterName));
 
-        /// <summary>
-        /// Gets an object representing a <see cref="SelfHelpSimplifiedSolutionResource"/> along with the instance operations that can be performed on it but with no data.
-        /// You can use <see cref="SelfHelpSimplifiedSolutionResource.CreateResourceIdentifier" /> to create a <see cref="SelfHelpSimplifiedSolutionResource"/> <see cref="ResourceIdentifier"/> from its components.
-        /// </summary>
-        /// <param name="id"> The resource ID of the resource to get. </param>
-        /// <returns> Returns a <see cref="SelfHelpSimplifiedSolutionResource"/> object. </returns>
-        public virtual SelfHelpSimplifiedSolutionResource GetSelfHelpSimplifiedSolutionResource(ResourceIdentifier id)
-        {
-            SelfHelpSimplifiedSolutionResource.ValidateResourceId(id);
-            return new SelfHelpSimplifiedSolutionResource(Client, id);
+            return await GetSelfHelpTroubleshooters(scope).GetAsync(troubleshooterName, cancellationToken).ConfigureAwait(false);
         }
 
-        /// <summary>
-        /// Gets an object representing a <see cref="SelfHelpTroubleshooterResource"/> along with the instance operations that can be performed on it but with no data.
-        /// You can use <see cref="SelfHelpTroubleshooterResource.CreateResourceIdentifier" /> to create a <see cref="SelfHelpTroubleshooterResource"/> <see cref="ResourceIdentifier"/> from its components.
-        /// </summary>
+        /// <summary> Gets an object representing a <see cref="SelfHelpSolutionResultResource"/> along with the instance operations that can be performed on it but with no data. </summary>
         /// <param name="id"> The resource ID of the resource to get. </param>
-        /// <returns> Returns a <see cref="SelfHelpTroubleshooterResource"/> object. </returns>
-        public virtual SelfHelpTroubleshooterResource GetSelfHelpTroubleshooterResource(ResourceIdentifier id)
+        /// <returns> Returns a <see cref="SelfHelpSolutionResultResource"/> object. </returns>
+        public virtual SelfHelpSolutionResultResource GetSelfHelpSolutionResultResource(ResourceIdentifier id)
         {
-            SelfHelpTroubleshooterResource.ValidateResourceId(id);
-            return new SelfHelpTroubleshooterResource(Client, id);
+            SelfHelpSolutionResultResource.ValidateResourceId(id);
+            return new SelfHelpSolutionResultResource(Client, id);
         }
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Extensions/MockableSelfHelpSubscriptionResource.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Extensions/MockableSelfHelpSubscriptionResource.cs
index 93585d37fbee..0e9fbeb51f4e 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Extensions/MockableSelfHelpSubscriptionResource.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Extensions/MockableSelfHelpSubscriptionResource.cs
@@ -5,91 +5,129 @@
 
 #nullable disable
 
+using System;
 using System.Threading;
-using Autorest.CSharp.Core;
+using System.Threading.Tasks;
+using Azure;
 using Azure.Core;
 using Azure.Core.Pipeline;
+using Azure.ResourceManager;
+using Azure.ResourceManager.Resources;
+using Azure.ResourceManager.SelfHelp;
 using Azure.ResourceManager.SelfHelp.Models;
 
 namespace Azure.ResourceManager.SelfHelp.Mocking
 {
-    /// <summary> A class to add extension methods to SubscriptionResource. </summary>
+    /// <summary> A class to add extension methods to <see cref="SubscriptionResource"/>. </summary>
     public partial class MockableSelfHelpSubscriptionResource : ArmResource
     {
         private ClientDiagnostics _discoverySolutionNLPClientDiagnostics;
-        private DiscoverySolutionNLPRestOperations _discoverySolutionNLPRestClient;
+        private DiscoverySolutionNLP _discoverySolutionNLPRestClient;
 
-        /// <summary> Initializes a new instance of the <see cref="MockableSelfHelpSubscriptionResource"/> class for mocking. </summary>
+        /// <summary> Initializes a new instance of MockableSelfHelpSubscriptionResource for mocking. </summary>
         protected MockableSelfHelpSubscriptionResource()
         {
         }
 
-        /// <summary> Initializes a new instance of the <see cref="MockableSelfHelpSubscriptionResource"/> class. </summary>
+        /// <summary> Initializes a new instance of <see cref="MockableSelfHelpSubscriptionResource"/> class. </summary>
         /// <param name="client"> The client parameters to use in these operations. </param>
         /// <param name="id"> The identifier of the resource that is the target of operations. </param>
         internal MockableSelfHelpSubscriptionResource(ArmClient client, ResourceIdentifier id) : base(client, id)
         {
         }
 
-        private ClientDiagnostics DiscoverySolutionNLPClientDiagnostics => _discoverySolutionNLPClientDiagnostics ??= new ClientDiagnostics("Azure.ResourceManager.SelfHelp", ProviderConstants.DefaultProviderNamespace, Diagnostics);
-        private DiscoverySolutionNLPRestOperations DiscoverySolutionNLPRestClient => _discoverySolutionNLPRestClient ??= new DiscoverySolutionNLPRestOperations(Pipeline, Diagnostics.ApplicationId, Endpoint);
+        private ClientDiagnostics DiscoverySolutionNLPClientDiagnostics => _discoverySolutionNLPClientDiagnostics ??= new ClientDiagnostics("Azure.ResourceManager.SelfHelp.Mocking", ProviderConstants.DefaultProviderNamespace, Diagnostics);
 
-        private string GetApiVersionOrNull(ResourceType resourceType)
-        {
-            TryGetApiVersion(resourceType, out string apiVersion);
-            return apiVersion;
-        }
+        private DiscoverySolutionNLP DiscoverySolutionNLPRestClient => _discoverySolutionNLPRestClient ??= new DiscoverySolutionNLP(DiscoverySolutionNLPClientDiagnostics, Pipeline, Endpoint, "2024-03-01-preview");
 
         /// <summary>
         /// Search for relevant Azure Diagnostics, Solutions and Troubleshooters using a natural language issue summary and subscription.
         /// <list type="bullet">
         /// <item>
-        /// <term>Request Path</term>
-        /// <description>/subscriptions/{subscriptionId}/providers/Microsoft.Help/discoverSolutions</description>
+        /// <term> Request Path. </term>
+        /// <description> /subscriptions/{subscriptionId}/providers/Microsoft.Help/discoverSolutions. </description>
         /// </item>
         /// <item>
-        /// <term>Operation Id</term>
-        /// <description>DiscoverySolutionNLPOperationGroup_DiscoverSolutionsNlp</description>
+        /// <term> Operation Id. </term>
+        /// <description> DiscoverySolutionNLPOperationGroup_DiscoverSolutionsBySubscription. </description>
         /// </item>
         /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
         /// </item>
         /// </list>
         /// </summary>
-        /// <param name="content"> The request body. </param>
+        /// <param name="discoverSolutionRequest"> The request body. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <returns> An async collection of <see cref="SolutionNlpMetadata"/> that may take multiple service requests to iterate over. </returns>
-        public virtual AsyncPageable<SolutionNlpMetadata> DiscoverSolutionsNlpAsync(DiscoveryNlpContent content = null, CancellationToken cancellationToken = default)
+        public virtual async Task<Response<DiscoveryNlpResult>> DiscoverSolutionsNlpAsync(DiscoveryNlpContent discoverSolutionRequest = default, CancellationToken cancellationToken = default)
         {
-            HttpMessage FirstPageRequest(int? pageSizeHint) => DiscoverySolutionNLPRestClient.CreateDiscoverSolutionsNlpRequest(Id.SubscriptionId, content);
-            return GeneratorPageableHelpers.CreateAsyncPageable(FirstPageRequest, null, e => SolutionNlpMetadata.DeserializeSolutionNlpMetadata(e), DiscoverySolutionNLPClientDiagnostics, Pipeline, "MockableSelfHelpSubscriptionResource.DiscoverSolutionsNlp", "value", null, cancellationToken);
+            using DiagnosticScope scope = DiscoverySolutionNLPClientDiagnostics.CreateScope("MockableSelfHelpSubscriptionResource.DiscoverSolutionsNlp");
+            scope.Start();
+            try
+            {
+                RequestContext context = new RequestContext
+                {
+                    CancellationToken = cancellationToken
+                };
+                HttpMessage message = DiscoverySolutionNLPRestClient.CreateDiscoverSolutionsNlpRequest(Guid.Parse(Id.SubscriptionId), DiscoveryNlpContent.ToRequestContent(discoverSolutionRequest), context);
+                Response result = await Pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
+                Response<DiscoveryNlpResult> response = Response.FromValue(DiscoveryNlpResult.FromResponse(result), result);
+                if (response.Value == null)
+                {
+                    throw new RequestFailedException(response.GetRawResponse());
+                }
+                return response;
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
         }
 
         /// <summary>
         /// Search for relevant Azure Diagnostics, Solutions and Troubleshooters using a natural language issue summary and subscription.
         /// <list type="bullet">
         /// <item>
-        /// <term>Request Path</term>
-        /// <description>/subscriptions/{subscriptionId}/providers/Microsoft.Help/discoverSolutions</description>
+        /// <term> Request Path. </term>
+        /// <description> /subscriptions/{subscriptionId}/providers/Microsoft.Help/discoverSolutions. </description>
         /// </item>
         /// <item>
-        /// <term>Operation Id</term>
-        /// <description>DiscoverySolutionNLPOperationGroup_DiscoverSolutionsNlp</description>
+        /// <term> Operation Id. </term>
+        /// <description> DiscoverySolutionNLPOperationGroup_DiscoverSolutionsBySubscription. </description>
         /// </item>
         /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
         /// </item>
         /// </list>
         /// </summary>
-        /// <param name="content"> The request body. </param>
+        /// <param name="discoverSolutionRequest"> The request body. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <returns> A collection of <see cref="SolutionNlpMetadata"/> that may take multiple service requests to iterate over. </returns>
-        public virtual Pageable<SolutionNlpMetadata> DiscoverSolutionsNlp(DiscoveryNlpContent content = null, CancellationToken cancellationToken = default)
+        public virtual Response<DiscoveryNlpResult> DiscoverSolutionsNlp(DiscoveryNlpContent discoverSolutionRequest = default, CancellationToken cancellationToken = default)
         {
-            HttpMessage FirstPageRequest(int? pageSizeHint) => DiscoverySolutionNLPRestClient.CreateDiscoverSolutionsNlpRequest(Id.SubscriptionId, content);
-            return GeneratorPageableHelpers.CreatePageable(FirstPageRequest, null, e => SolutionNlpMetadata.DeserializeSolutionNlpMetadata(e), DiscoverySolutionNLPClientDiagnostics, Pipeline, "MockableSelfHelpSubscriptionResource.DiscoverSolutionsNlp", "value", null, cancellationToken);
+            using DiagnosticScope scope = DiscoverySolutionNLPClientDiagnostics.CreateScope("MockableSelfHelpSubscriptionResource.DiscoverSolutionsNlp");
+            scope.Start();
+            try
+            {
+                RequestContext context = new RequestContext
+                {
+                    CancellationToken = cancellationToken
+                };
+                HttpMessage message = DiscoverySolutionNLPRestClient.CreateDiscoverSolutionsNlpRequest(Guid.Parse(Id.SubscriptionId), DiscoveryNlpContent.ToRequestContent(discoverSolutionRequest), context);
+                Response result = Pipeline.ProcessMessage(message, context);
+                Response<DiscoveryNlpResult> response = Response.FromValue(DiscoveryNlpResult.FromResponse(result), result);
+                if (response.Value == null)
+                {
+                    throw new RequestFailedException(response.GetRawResponse());
+                }
+                return response;
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
         }
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Extensions/MockableSelfHelpTenantResource.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Extensions/MockableSelfHelpTenantResource.cs
index 01d79921d536..539acd98d3fc 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Extensions/MockableSelfHelpTenantResource.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Extensions/MockableSelfHelpTenantResource.cs
@@ -8,130 +8,87 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
-using Autorest.CSharp.Core;
+using Azure;
 using Azure.Core;
 using Azure.Core.Pipeline;
+using Azure.ResourceManager;
+using Azure.ResourceManager.Resources;
+using Azure.ResourceManager.SelfHelp;
 using Azure.ResourceManager.SelfHelp.Models;
 
 namespace Azure.ResourceManager.SelfHelp.Mocking
 {
-    /// <summary> A class to add extension methods to TenantResource. </summary>
+    /// <summary> A class to add extension methods to <see cref="TenantResource"/>. </summary>
     public partial class MockableSelfHelpTenantResource : ArmResource
     {
         private ClientDiagnostics _discoverySolutionNLPOperationGroupClientDiagnostics;
-        private DiscoverySolutionNLPOperationGroupRestOperations _discoverySolutionNLPOperationGroupRestClient;
-        private ClientDiagnostics _solutionSelfHelpClientDiagnostics;
-        private SolutionSelfHelpRestOperations _solutionSelfHelpRestClient;
+        private DiscoverySolutionNLPOperationGroup _discoverySolutionNLPOperationGroupRestClient;
         private ClientDiagnostics _discoverySolutionClientDiagnostics;
-        private DiscoverySolutionRestOperations _discoverySolutionRestClient;
+        private DiscoverySolution _discoverySolutionRestClient;
 
-        /// <summary> Initializes a new instance of the <see cref="MockableSelfHelpTenantResource"/> class for mocking. </summary>
+        /// <summary> Initializes a new instance of MockableSelfHelpTenantResource for mocking. </summary>
         protected MockableSelfHelpTenantResource()
         {
         }
 
-        /// <summary> Initializes a new instance of the <see cref="MockableSelfHelpTenantResource"/> class. </summary>
+        /// <summary> Initializes a new instance of <see cref="MockableSelfHelpTenantResource"/> class. </summary>
         /// <param name="client"> The client parameters to use in these operations. </param>
         /// <param name="id"> The identifier of the resource that is the target of operations. </param>
         internal MockableSelfHelpTenantResource(ArmClient client, ResourceIdentifier id) : base(client, id)
         {
         }
 
-        private ClientDiagnostics DiscoverySolutionNLPOperationGroupClientDiagnostics => _discoverySolutionNLPOperationGroupClientDiagnostics ??= new ClientDiagnostics("Azure.ResourceManager.SelfHelp", ProviderConstants.DefaultProviderNamespace, Diagnostics);
-        private DiscoverySolutionNLPOperationGroupRestOperations DiscoverySolutionNLPOperationGroupRestClient => _discoverySolutionNLPOperationGroupRestClient ??= new DiscoverySolutionNLPOperationGroupRestOperations(Pipeline, Diagnostics.ApplicationId, Endpoint);
-        private ClientDiagnostics SolutionSelfHelpClientDiagnostics => _solutionSelfHelpClientDiagnostics ??= new ClientDiagnostics("Azure.ResourceManager.SelfHelp", ProviderConstants.DefaultProviderNamespace, Diagnostics);
-        private SolutionSelfHelpRestOperations SolutionSelfHelpRestClient => _solutionSelfHelpRestClient ??= new SolutionSelfHelpRestOperations(Pipeline, Diagnostics.ApplicationId, Endpoint);
-        private ClientDiagnostics DiscoverySolutionClientDiagnostics => _discoverySolutionClientDiagnostics ??= new ClientDiagnostics("Azure.ResourceManager.SelfHelp", ProviderConstants.DefaultProviderNamespace, Diagnostics);
-        private DiscoverySolutionRestOperations DiscoverySolutionRestClient => _discoverySolutionRestClient ??= new DiscoverySolutionRestOperations(Pipeline, Diagnostics.ApplicationId, Endpoint);
+        private ClientDiagnostics DiscoverySolutionNLPOperationGroupClientDiagnostics => _discoverySolutionNLPOperationGroupClientDiagnostics ??= new ClientDiagnostics("Azure.ResourceManager.SelfHelp.Mocking", ProviderConstants.DefaultProviderNamespace, Diagnostics);
 
-        private string GetApiVersionOrNull(ResourceType resourceType)
-        {
-            TryGetApiVersion(resourceType, out string apiVersion);
-            return apiVersion;
-        }
+        private DiscoverySolutionNLPOperationGroup DiscoverySolutionNLPOperationGroupRestClient => _discoverySolutionNLPOperationGroupRestClient ??= new DiscoverySolutionNLPOperationGroup(DiscoverySolutionNLPOperationGroupClientDiagnostics, Pipeline, Endpoint, "2024-03-01-preview");
 
-        /// <summary>
-        /// Search for relevant Azure Diagnostics, Solutions and Troubleshooters using a natural language issue summary.
-        /// <list type="bullet">
-        /// <item>
-        /// <term>Request Path</term>
-        /// <description>/providers/Microsoft.Help/discoverSolutions</description>
-        /// </item>
-        /// <item>
-        /// <term>Operation Id</term>
-        /// <description>DiscoverySolutionNLPOperationGroup_DiscoverSolutionsNlp</description>
-        /// </item>
-        /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
-        /// </item>
-        /// </list>
-        /// </summary>
-        /// <param name="content"> The request body. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <returns> An async collection of <see cref="SolutionNlpMetadata"/> that may take multiple service requests to iterate over. </returns>
-        public virtual AsyncPageable<SolutionNlpMetadata> DiscoverSolutionsNlpAsync(DiscoveryNlpContent content = null, CancellationToken cancellationToken = default)
-        {
-            HttpMessage FirstPageRequest(int? pageSizeHint) => DiscoverySolutionNLPOperationGroupRestClient.CreateDiscoverSolutionsNlpRequest(content);
-            return GeneratorPageableHelpers.CreateAsyncPageable(FirstPageRequest, null, e => SolutionNlpMetadata.DeserializeSolutionNlpMetadata(e), DiscoverySolutionNLPOperationGroupClientDiagnostics, Pipeline, "MockableSelfHelpTenantResource.DiscoverSolutionsNlp", "value", null, cancellationToken);
-        }
+        private ClientDiagnostics DiscoverySolutionClientDiagnostics => _discoverySolutionClientDiagnostics ??= new ClientDiagnostics("Azure.ResourceManager.SelfHelp.Mocking", ProviderConstants.DefaultProviderNamespace, Diagnostics);
 
-        /// <summary>
-        /// Search for relevant Azure Diagnostics, Solutions and Troubleshooters using a natural language issue summary.
-        /// <list type="bullet">
-        /// <item>
-        /// <term>Request Path</term>
-        /// <description>/providers/Microsoft.Help/discoverSolutions</description>
-        /// </item>
-        /// <item>
-        /// <term>Operation Id</term>
-        /// <description>DiscoverySolutionNLPOperationGroup_DiscoverSolutionsNlp</description>
-        /// </item>
-        /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
-        /// </item>
-        /// </list>
-        /// </summary>
-        /// <param name="content"> The request body. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <returns> A collection of <see cref="SolutionNlpMetadata"/> that may take multiple service requests to iterate over. </returns>
-        public virtual Pageable<SolutionNlpMetadata> DiscoverSolutionsNlp(DiscoveryNlpContent content = null, CancellationToken cancellationToken = default)
+        private DiscoverySolution DiscoverySolutionRestClient => _discoverySolutionRestClient ??= new DiscoverySolution(DiscoverySolutionClientDiagnostics, Pipeline, Endpoint, "2024-03-01-preview");
+
+        /// <summary> Gets a collection of SelfHelpSolutionResults in the <see cref="TenantResource"/>. </summary>
+        /// <returns> An object representing collection of SelfHelpSolutionResults and their operations over a SelfHelpSolutionResultResource. </returns>
+        public virtual SelfHelpSolutionResultCollection GetSelfHelpSolutionResults()
         {
-            HttpMessage FirstPageRequest(int? pageSizeHint) => DiscoverySolutionNLPOperationGroupRestClient.CreateDiscoverSolutionsNlpRequest(content);
-            return GeneratorPageableHelpers.CreatePageable(FirstPageRequest, null, e => SolutionNlpMetadata.DeserializeSolutionNlpMetadata(e), DiscoverySolutionNLPOperationGroupClientDiagnostics, Pipeline, "MockableSelfHelpTenantResource.DiscoverSolutionsNlp", "value", null, cancellationToken);
+            return GetCachedClient(client => new SelfHelpSolutionResultCollection(client, Id));
         }
 
         /// <summary>
-        /// Gets Self Help Solutions for a given solutionId. Self Help Solutions consist of rich instructional video tutorials, links and guides to public documentation related to a specific problem that enables users to troubleshoot Azure issues.
+        /// Search for relevant Azure Diagnostics, Solutions and Troubleshooters using a natural language issue summary.
         /// <list type="bullet">
         /// <item>
-        /// <term>Request Path</term>
-        /// <description>/providers/Microsoft.Help/selfHelp/{solutionId}</description>
+        /// <term> Request Path. </term>
+        /// <description> /providers/Microsoft.Help/discoverSolutions. </description>
         /// </item>
         /// <item>
-        /// <term>Operation Id</term>
-        /// <description>SolutionResourceSelfHelp_GetSelfHelpSolutionById</description>
+        /// <term> Operation Id. </term>
+        /// <description> DiscoverySolutionNLPOperationGroup_DiscoverSolutions. </description>
         /// </item>
         /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
         /// </item>
         /// </list>
         /// </summary>
-        /// <param name="solutionId"> SolutionId is a unique id to identify a solution. You can retrieve the solution id using the Discovery api - https://learn.microsoft.com/en-us/rest/api/help/discovery-solution/list?view=rest-help-2023-09-01-preview&amp;tabs=HTTP. </param>
+        /// <param name="discoverSolutionRequest"> The request body. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentException"> <paramref name="solutionId"/> is an empty string, and was expected to be non-empty. </exception>
-        /// <exception cref="ArgumentNullException"> <paramref name="solutionId"/> is null. </exception>
-        public virtual async Task<Response<SelfHelpSolutionResult>> GetSelfHelpSolutionByIdAsync(string solutionId, CancellationToken cancellationToken = default)
+        public virtual async Task<Response<DiscoveryNlpResult>> DiscoverSolutionsNlpAsync(DiscoveryNlpContent discoverSolutionRequest = default, CancellationToken cancellationToken = default)
         {
-            Argument.AssertNotNullOrEmpty(solutionId, nameof(solutionId));
-
-            using var scope = SolutionSelfHelpClientDiagnostics.CreateScope("MockableSelfHelpTenantResource.GetSelfHelpSolutionById");
+            using DiagnosticScope scope = DiscoverySolutionNLPOperationGroupClientDiagnostics.CreateScope("MockableSelfHelpTenantResource.DiscoverSolutionsNlp");
             scope.Start();
             try
             {
-                var response = await SolutionSelfHelpRestClient.GetSelfHelpSolutionByIdAsync(solutionId, cancellationToken).ConfigureAwait(false);
+                RequestContext context = new RequestContext
+                {
+                    CancellationToken = cancellationToken
+                };
+                HttpMessage message = DiscoverySolutionNLPOperationGroupRestClient.CreateDiscoverSolutionsNlpRequest(DiscoveryNlpContent.ToRequestContent(discoverSolutionRequest), context);
+                Response result = await Pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
+                Response<DiscoveryNlpResult> response = Response.FromValue(DiscoveryNlpResult.FromResponse(result), result);
+                if (response.Value == null)
+                {
+                    throw new RequestFailedException(response.GetRawResponse());
+                }
                 return response;
             }
             catch (Exception e)
@@ -142,35 +99,41 @@ public virtual async Task<Response<SelfHelpSolutionResult>> GetSelfHelpSolutionB
         }
 
         /// <summary>
-        /// Gets Self Help Solutions for a given solutionId. Self Help Solutions consist of rich instructional video tutorials, links and guides to public documentation related to a specific problem that enables users to troubleshoot Azure issues.
+        /// Search for relevant Azure Diagnostics, Solutions and Troubleshooters using a natural language issue summary.
         /// <list type="bullet">
         /// <item>
-        /// <term>Request Path</term>
-        /// <description>/providers/Microsoft.Help/selfHelp/{solutionId}</description>
+        /// <term> Request Path. </term>
+        /// <description> /providers/Microsoft.Help/discoverSolutions. </description>
         /// </item>
         /// <item>
-        /// <term>Operation Id</term>
-        /// <description>SolutionResourceSelfHelp_GetSelfHelpSolutionById</description>
+        /// <term> Operation Id. </term>
+        /// <description> DiscoverySolutionNLPOperationGroup_DiscoverSolutions. </description>
         /// </item>
         /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
         /// </item>
         /// </list>
         /// </summary>
-        /// <param name="solutionId"> SolutionId is a unique id to identify a solution. You can retrieve the solution id using the Discovery api - https://learn.microsoft.com/en-us/rest/api/help/discovery-solution/list?view=rest-help-2023-09-01-preview&amp;tabs=HTTP. </param>
+        /// <param name="discoverSolutionRequest"> The request body. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentException"> <paramref name="solutionId"/> is an empty string, and was expected to be non-empty. </exception>
-        /// <exception cref="ArgumentNullException"> <paramref name="solutionId"/> is null. </exception>
-        public virtual Response<SelfHelpSolutionResult> GetSelfHelpSolutionById(string solutionId, CancellationToken cancellationToken = default)
+        public virtual Response<DiscoveryNlpResult> DiscoverSolutionsNlp(DiscoveryNlpContent discoverSolutionRequest = default, CancellationToken cancellationToken = default)
         {
-            Argument.AssertNotNullOrEmpty(solutionId, nameof(solutionId));
-
-            using var scope = SolutionSelfHelpClientDiagnostics.CreateScope("MockableSelfHelpTenantResource.GetSelfHelpSolutionById");
+            using DiagnosticScope scope = DiscoverySolutionNLPOperationGroupClientDiagnostics.CreateScope("MockableSelfHelpTenantResource.DiscoverSolutionsNlp");
             scope.Start();
             try
             {
-                var response = SolutionSelfHelpRestClient.GetSelfHelpSolutionById(solutionId, cancellationToken);
+                RequestContext context = new RequestContext
+                {
+                    CancellationToken = cancellationToken
+                };
+                HttpMessage message = DiscoverySolutionNLPOperationGroupRestClient.CreateDiscoverSolutionsNlpRequest(DiscoveryNlpContent.ToRequestContent(discoverSolutionRequest), context);
+                Response result = Pipeline.ProcessMessage(message, context);
+                Response<DiscoveryNlpResult> response = Response.FromValue(DiscoveryNlpResult.FromResponse(result), result);
+                if (response.Value == null)
+                {
+                    throw new RequestFailedException(response.GetRawResponse());
+                }
                 return response;
             }
             catch (Exception e)
@@ -184,44 +147,46 @@ public virtual Response<SelfHelpSolutionResult> GetSelfHelpSolutionById(string s
         /// Lists the relevant Azure Diagnostics, Solutions and Troubleshooters using [problemClassification API](https://learn.microsoft.com/rest/api/support/problem-classifications/list?tabs=HTTP)) AND  resourceUri or resourceType.&lt;br/&gt; Discovery Solutions is the initial entry point within Help API, which identifies relevant Azure diagnostics and solutions. &lt;br/&gt;&lt;br/&gt; Required Input :  problemClassificationId (Use the [problemClassification API](https://learn.microsoft.com/rest/api/support/problem-classifications/list?tabs=HTTP)) &lt;br/&gt;Optional input: resourceUri OR resource Type &lt;br/&gt;&lt;br/&gt; &lt;b&gt;Note: &lt;/b&gt;  ‘requiredInputs’ from Discovery solutions response must be passed via ‘additionalParameters’ as an input to Diagnostics and Solutions API.
         /// <list type="bullet">
         /// <item>
-        /// <term>Request Path</term>
-        /// <description>/providers/Microsoft.Help/discoverySolutions</description>
+        /// <term> Request Path. </term>
+        /// <description> /providers/Microsoft.Help/discoverySolutions. </description>
         /// </item>
         /// <item>
-        /// <term>Operation Id</term>
-        /// <description>DiscoverySolutionOperationGroup_DiscoverSolutions</description>
+        /// <term> Operation Id. </term>
+        /// <description> DiscoverySolutionOperationGroup_List. </description>
         /// </item>
         /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="filter"> 'ProblemClassificationId' is a mandatory filter to get solutions ids. It also supports optional 'ResourceType' and 'SolutionType' filters. The [$filter](https://learn.microsoft.com/en-us/odata/webapi/first-odata-api#filter) supports only 'and', 'or' and 'eq' operators. Example: $filter=ProblemClassificationId eq '1ddda5b4-cf6c-4d4f-91ad-bc38ab0e811e'. </param>
         /// <param name="skiptoken"> Skiptoken is only used if a previous operation returned a partial result. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <returns> An async collection of <see cref="SelfHelpSolutionMetadata"/> that may take multiple service requests to iterate over. </returns>
-        public virtual AsyncPageable<SelfHelpSolutionMetadata> DiscoverSolutionsAsync(string filter = null, string skiptoken = null, CancellationToken cancellationToken = default)
+        /// <returns> A collection of <see cref="SelfHelpSolutionMetadata"/> that may take multiple service requests to iterate over. </returns>
+        public virtual AsyncPageable<SelfHelpSolutionMetadata> DiscoverSolutionsAsync(string filter = default, string skiptoken = default, CancellationToken cancellationToken = default)
         {
-            HttpMessage FirstPageRequest(int? pageSizeHint) => DiscoverySolutionRestClient.CreateDiscoverSolutionsRequest(filter, skiptoken);
-            HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => DiscoverySolutionRestClient.CreateDiscoverSolutionsNextPageRequest(nextLink, filter, skiptoken);
-            return GeneratorPageableHelpers.CreateAsyncPageable(FirstPageRequest, NextPageRequest, e => SelfHelpSolutionMetadata.DeserializeSelfHelpSolutionMetadata(e), DiscoverySolutionClientDiagnostics, Pipeline, "MockableSelfHelpTenantResource.DiscoverSolutions", "value", "nextLink", cancellationToken);
+            RequestContext context = new RequestContext
+            {
+                CancellationToken = cancellationToken
+            };
+            return new DiscoverySolutionDiscoverSolutionsAsyncCollectionResultOfT(DiscoverySolutionRestClient, filter, skiptoken, context);
         }
 
         /// <summary>
         /// Lists the relevant Azure Diagnostics, Solutions and Troubleshooters using [problemClassification API](https://learn.microsoft.com/rest/api/support/problem-classifications/list?tabs=HTTP)) AND  resourceUri or resourceType.&lt;br/&gt; Discovery Solutions is the initial entry point within Help API, which identifies relevant Azure diagnostics and solutions. &lt;br/&gt;&lt;br/&gt; Required Input :  problemClassificationId (Use the [problemClassification API](https://learn.microsoft.com/rest/api/support/problem-classifications/list?tabs=HTTP)) &lt;br/&gt;Optional input: resourceUri OR resource Type &lt;br/&gt;&lt;br/&gt; &lt;b&gt;Note: &lt;/b&gt;  ‘requiredInputs’ from Discovery solutions response must be passed via ‘additionalParameters’ as an input to Diagnostics and Solutions API.
         /// <list type="bullet">
         /// <item>
-        /// <term>Request Path</term>
-        /// <description>/providers/Microsoft.Help/discoverySolutions</description>
+        /// <term> Request Path. </term>
+        /// <description> /providers/Microsoft.Help/discoverySolutions. </description>
         /// </item>
         /// <item>
-        /// <term>Operation Id</term>
-        /// <description>DiscoverySolutionOperationGroup_DiscoverSolutions</description>
+        /// <term> Operation Id. </term>
+        /// <description> DiscoverySolutionOperationGroup_List. </description>
         /// </item>
         /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
         /// </item>
         /// </list>
         /// </summary>
@@ -229,11 +194,13 @@ public virtual AsyncPageable<SelfHelpSolutionMetadata> DiscoverSolutionsAsync(st
         /// <param name="skiptoken"> Skiptoken is only used if a previous operation returned a partial result. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <returns> A collection of <see cref="SelfHelpSolutionMetadata"/> that may take multiple service requests to iterate over. </returns>
-        public virtual Pageable<SelfHelpSolutionMetadata> DiscoverSolutions(string filter = null, string skiptoken = null, CancellationToken cancellationToken = default)
+        public virtual Pageable<SelfHelpSolutionMetadata> DiscoverSolutions(string filter = default, string skiptoken = default, CancellationToken cancellationToken = default)
         {
-            HttpMessage FirstPageRequest(int? pageSizeHint) => DiscoverySolutionRestClient.CreateDiscoverSolutionsRequest(filter, skiptoken);
-            HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => DiscoverySolutionRestClient.CreateDiscoverSolutionsNextPageRequest(nextLink, filter, skiptoken);
-            return GeneratorPageableHelpers.CreatePageable(FirstPageRequest, NextPageRequest, e => SelfHelpSolutionMetadata.DeserializeSelfHelpSolutionMetadata(e), DiscoverySolutionClientDiagnostics, Pipeline, "MockableSelfHelpTenantResource.DiscoverSolutions", "value", "nextLink", cancellationToken);
+            RequestContext context = new RequestContext
+            {
+                CancellationToken = cancellationToken
+            };
+            return new DiscoverySolutionDiscoverSolutionsCollectionResultOfT(DiscoverySolutionRestClient, filter, skiptoken, context);
         }
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Extensions/SelfHelpExtensions.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Extensions/SelfHelpExtensions.cs
index 915909a8aec7..f95b254ba98a 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Extensions/SelfHelpExtensions.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Extensions/SelfHelpExtensions.cs
@@ -8,7 +8,9 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
+using Azure;
 using Azure.Core;
+using Azure.ResourceManager;
 using Azure.ResourceManager.Resources;
 using Azure.ResourceManager.SelfHelp.Mocking;
 using Azure.ResourceManager.SelfHelp.Models;
@@ -18,109 +20,72 @@ namespace Azure.ResourceManager.SelfHelp
     /// <summary> A class to add extension methods to Azure.ResourceManager.SelfHelp. </summary>
     public static partial class SelfHelpExtensions
     {
+        /// <param name="client"></param>
         private static MockableSelfHelpArmClient GetMockableSelfHelpArmClient(ArmClient client)
         {
-            return client.GetCachedClient(client0 => new MockableSelfHelpArmClient(client0));
+            return client.GetCachedClient(client0 => new MockableSelfHelpArmClient(client0, ResourceIdentifier.Root));
         }
 
-        private static MockableSelfHelpSubscriptionResource GetMockableSelfHelpSubscriptionResource(ArmResource resource)
+        /// <param name="subscriptionResource"></param>
+        private static MockableSelfHelpSubscriptionResource GetMockableSelfHelpSubscriptionResource(SubscriptionResource subscriptionResource)
         {
-            return resource.GetCachedClient(client => new MockableSelfHelpSubscriptionResource(client, resource.Id));
+            return subscriptionResource.GetCachedClient(client => new MockableSelfHelpSubscriptionResource(client, subscriptionResource.Id));
         }
 
-        private static MockableSelfHelpTenantResource GetMockableSelfHelpTenantResource(ArmResource resource)
+        /// <param name="tenantResource"></param>
+        private static MockableSelfHelpTenantResource GetMockableSelfHelpTenantResource(TenantResource tenantResource)
         {
-            return resource.GetCachedClient(client => new MockableSelfHelpTenantResource(client, resource.Id));
+            return tenantResource.GetCachedClient(client => new MockableSelfHelpTenantResource(client, tenantResource.Id));
         }
 
         /// <summary>
-        /// Gets a collection of SelfHelpDiagnosticResources in the ArmClient.
+        /// Gets an object representing a <see cref="SelfHelpDiagnosticResource"/> along with the instance operations that can be performed on it but with no data.
         /// <item>
-        /// <term>Mocking</term>
-        /// <description>To mock this method, please mock <see cref="MockableSelfHelpArmClient.GetSelfHelpDiagnostics(ResourceIdentifier)"/> instead.</description>
+        /// <term> Mocking. </term>
+        /// <description> To mock this method, please mock <see cref="MockableSelfHelpArmClient.GetSelfHelpDiagnosticResource(ResourceIdentifier)"/> instead. </description>
         /// </item>
         /// </summary>
-        /// <param name="client"> The <see cref="ArmClient" /> instance the method will execute against. </param>
-        /// <param name="scope"> The scope that the resource will apply against. </param>
+        /// <param name="client"> The <see cref="ArmClient"/> the method will execute against. </param>
+        /// <param name="id"> The resource ID of the resource to get. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="client"/> is null. </exception>
-        /// <returns> An object representing collection of SelfHelpDiagnosticResources and their operations over a SelfHelpDiagnosticResource. </returns>
-        public static SelfHelpDiagnosticCollection GetSelfHelpDiagnostics(this ArmClient client, ResourceIdentifier scope)
+        /// <returns> Returns a <see cref="SelfHelpDiagnosticResource"/> object. </returns>
+        public static SelfHelpDiagnosticResource GetSelfHelpDiagnosticResource(this ArmClient client, ResourceIdentifier id)
         {
             Argument.AssertNotNull(client, nameof(client));
 
-            return GetMockableSelfHelpArmClient(client).GetSelfHelpDiagnostics(scope);
+            return GetMockableSelfHelpArmClient(client).GetSelfHelpDiagnosticResource(id);
         }
 
         /// <summary>
-        /// Get the diagnostics using the 'diagnosticsResourceName' you chose while creating the diagnostic.
-        /// <list type="bullet">
-        /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/diagnostics/{diagnosticsResourceName}</description>
-        /// </item>
-        /// <item>
-        /// <term>Operation Id</term>
-        /// <description>DiagnosticResource_Get</description>
-        /// </item>
-        /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
-        /// </item>
-        /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpDiagnosticResource"/></description>
-        /// </item>
-        /// </list>
+        /// Gets a collection of <see cref="SelfHelpDiagnosticCollection"/> objects within the specified scope.
         /// <item>
-        /// <term>Mocking</term>
-        /// <description>To mock this method, please mock <see cref="MockableSelfHelpArmClient.GetSelfHelpDiagnosticAsync(ResourceIdentifier,string,CancellationToken)"/> instead.</description>
+        /// <term> Mocking. </term>
+        /// <description> To mock this method, please mock <see cref="MockableSelfHelpArmClient.GetSelfHelpDiagnostics(ResourceIdentifier)"/> instead. </description>
         /// </item>
         /// </summary>
-        /// <param name="client"> The <see cref="ArmClient" /> instance the method will execute against. </param>
-        /// <param name="scope"> The scope that the resource will apply against. </param>
-        /// <param name="diagnosticsResourceName"> Unique resource name for insight resources. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="client"/> or <paramref name="diagnosticsResourceName"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="diagnosticsResourceName"/> is an empty string, and was expected to be non-empty. </exception>
-        [ForwardsClientCalls]
-        public static async Task<Response<SelfHelpDiagnosticResource>> GetSelfHelpDiagnosticAsync(this ArmClient client, ResourceIdentifier scope, string diagnosticsResourceName, CancellationToken cancellationToken = default)
+        /// <param name="client"> The <see cref="ArmClient"/> the method will execute against. </param>
+        /// <param name="scope"> The scope of the resource collection to get. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="client"/> is null. </exception>
+        /// <returns> Returns a collection of <see cref="SelfHelpDiagnosticResource"/> objects. </returns>
+        public static SelfHelpDiagnosticCollection GetSelfHelpDiagnostics(this ArmClient client, ResourceIdentifier scope)
         {
             Argument.AssertNotNull(client, nameof(client));
 
-            return await GetMockableSelfHelpArmClient(client).GetSelfHelpDiagnosticAsync(scope, diagnosticsResourceName, cancellationToken).ConfigureAwait(false);
+            return GetMockableSelfHelpArmClient(client).GetSelfHelpDiagnostics(scope);
         }
 
         /// <summary>
         /// Get the diagnostics using the 'diagnosticsResourceName' you chose while creating the diagnostic.
-        /// <list type="bullet">
-        /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/diagnostics/{diagnosticsResourceName}</description>
-        /// </item>
-        /// <item>
-        /// <term>Operation Id</term>
-        /// <description>DiagnosticResource_Get</description>
-        /// </item>
-        /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
-        /// </item>
-        /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpDiagnosticResource"/></description>
-        /// </item>
-        /// </list>
         /// <item>
-        /// <term>Mocking</term>
-        /// <description>To mock this method, please mock <see cref="MockableSelfHelpArmClient.GetSelfHelpDiagnostic(ResourceIdentifier,string,CancellationToken)"/> instead.</description>
+        /// <term> Mocking. </term>
+        /// <description> To mock this method, please mock <see cref="MockableSelfHelpArmClient.GetSelfHelpDiagnostic(ResourceIdentifier, string, CancellationToken)"/> instead. </description>
         /// </item>
         /// </summary>
-        /// <param name="client"> The <see cref="ArmClient" /> instance the method will execute against. </param>
-        /// <param name="scope"> The scope that the resource will apply against. </param>
+        /// <param name="client"> The <see cref="ArmClient"/> the method will execute against. </param>
+        /// <param name="scope"> The scope of the resource collection to get. </param>
         /// <param name="diagnosticsResourceName"> Unique resource name for insight resources. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="client"/> or <paramref name="diagnosticsResourceName"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="diagnosticsResourceName"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="ArgumentNullException"> <paramref name="client"/> is null. </exception>
         [ForwardsClientCalls]
         public static Response<SelfHelpDiagnosticResource> GetSelfHelpDiagnostic(this ArmClient client, ResourceIdentifier scope, string diagnosticsResourceName, CancellationToken cancellationToken = default)
         {
@@ -130,661 +95,374 @@ public static Response<SelfHelpDiagnosticResource> GetSelfHelpDiagnostic(this Ar
         }
 
         /// <summary>
-        /// Gets a collection of SelfHelpSolutionResources in the ArmClient.
-        /// <item>
-        /// <term>Mocking</term>
-        /// <description>To mock this method, please mock <see cref="MockableSelfHelpArmClient.GetSelfHelpSolutions(ResourceIdentifier)"/> instead.</description>
-        /// </item>
-        /// </summary>
-        /// <param name="client"> The <see cref="ArmClient" /> instance the method will execute against. </param>
-        /// <param name="scope"> The scope that the resource will apply against. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="client"/> is null. </exception>
-        /// <returns> An object representing collection of SelfHelpSolutionResources and their operations over a SelfHelpSolutionResource. </returns>
-        public static SelfHelpSolutionCollection GetSelfHelpSolutions(this ArmClient client, ResourceIdentifier scope)
-        {
-            Argument.AssertNotNull(client, nameof(client));
-
-            return GetMockableSelfHelpArmClient(client).GetSelfHelpSolutions(scope);
-        }
-
-        /// <summary>
-        /// Get the solution using the applicable solutionResourceName while creating the solution.
-        /// <list type="bullet">
-        /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/solutions/{solutionResourceName}</description>
-        /// </item>
-        /// <item>
-        /// <term>Operation Id</term>
-        /// <description>SolutionResource_Get</description>
-        /// </item>
-        /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
-        /// </item>
-        /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpSolutionResource"/></description>
-        /// </item>
-        /// </list>
+        /// Get the diagnostics using the 'diagnosticsResourceName' you chose while creating the diagnostic.
         /// <item>
-        /// <term>Mocking</term>
-        /// <description>To mock this method, please mock <see cref="MockableSelfHelpArmClient.GetSelfHelpSolutionAsync(ResourceIdentifier,string,CancellationToken)"/> instead.</description>
+        /// <term> Mocking. </term>
+        /// <description> To mock this method, please mock <see cref="MockableSelfHelpArmClient.GetSelfHelpDiagnosticAsync(ResourceIdentifier, string, CancellationToken)"/> instead. </description>
         /// </item>
         /// </summary>
-        /// <param name="client"> The <see cref="ArmClient" /> instance the method will execute against. </param>
-        /// <param name="scope"> The scope that the resource will apply against. </param>
-        /// <param name="solutionResourceName"> Solution resource Name. </param>
+        /// <param name="client"> The <see cref="ArmClient"/> the method will execute against. </param>
+        /// <param name="scope"> The scope of the resource collection to get. </param>
+        /// <param name="diagnosticsResourceName"> Unique resource name for insight resources. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="client"/> or <paramref name="solutionResourceName"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="solutionResourceName"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="ArgumentNullException"> <paramref name="client"/> is null. </exception>
         [ForwardsClientCalls]
-        public static async Task<Response<SelfHelpSolutionResource>> GetSelfHelpSolutionAsync(this ArmClient client, ResourceIdentifier scope, string solutionResourceName, CancellationToken cancellationToken = default)
+        public static async Task<Response<SelfHelpDiagnosticResource>> GetSelfHelpDiagnosticAsync(this ArmClient client, ResourceIdentifier scope, string diagnosticsResourceName, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(client, nameof(client));
 
-            return await GetMockableSelfHelpArmClient(client).GetSelfHelpSolutionAsync(scope, solutionResourceName, cancellationToken).ConfigureAwait(false);
+            return await GetMockableSelfHelpArmClient(client).GetSelfHelpDiagnosticAsync(scope, diagnosticsResourceName, cancellationToken).ConfigureAwait(false);
         }
 
         /// <summary>
-        /// Get the solution using the applicable solutionResourceName while creating the solution.
-        /// <list type="bullet">
-        /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/solutions/{solutionResourceName}</description>
-        /// </item>
+        /// Gets an object representing a <see cref="SelfHelpSolutionResource"/> along with the instance operations that can be performed on it but with no data.
         /// <item>
-        /// <term>Operation Id</term>
-        /// <description>SolutionResource_Get</description>
-        /// </item>
-        /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
-        /// </item>
-        /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpSolutionResource"/></description>
-        /// </item>
-        /// </list>
-        /// <item>
-        /// <term>Mocking</term>
-        /// <description>To mock this method, please mock <see cref="MockableSelfHelpArmClient.GetSelfHelpSolution(ResourceIdentifier,string,CancellationToken)"/> instead.</description>
+        /// <term> Mocking. </term>
+        /// <description> To mock this method, please mock <see cref="MockableSelfHelpArmClient.GetSelfHelpSolutionResource(ResourceIdentifier)"/> instead. </description>
         /// </item>
         /// </summary>
-        /// <param name="client"> The <see cref="ArmClient" /> instance the method will execute against. </param>
-        /// <param name="scope"> The scope that the resource will apply against. </param>
-        /// <param name="solutionResourceName"> Solution resource Name. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="client"/> or <paramref name="solutionResourceName"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="solutionResourceName"/> is an empty string, and was expected to be non-empty. </exception>
-        [ForwardsClientCalls]
-        public static Response<SelfHelpSolutionResource> GetSelfHelpSolution(this ArmClient client, ResourceIdentifier scope, string solutionResourceName, CancellationToken cancellationToken = default)
+        /// <param name="client"> The <see cref="ArmClient"/> the method will execute against. </param>
+        /// <param name="id"> The resource ID of the resource to get. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="client"/> is null. </exception>
+        /// <returns> Returns a <see cref="SelfHelpSolutionResource"/> object. </returns>
+        public static SelfHelpSolutionResource GetSelfHelpSolutionResource(this ArmClient client, ResourceIdentifier id)
         {
             Argument.AssertNotNull(client, nameof(client));
 
-            return GetMockableSelfHelpArmClient(client).GetSelfHelpSolution(scope, solutionResourceName, cancellationToken);
+            return GetMockableSelfHelpArmClient(client).GetSelfHelpSolutionResource(id);
         }
 
         /// <summary>
-        /// Gets a collection of SelfHelpSimplifiedSolutionResources in the ArmClient.
+        /// Gets a collection of <see cref="SelfHelpSolutionCollection"/> objects within the specified scope.
         /// <item>
-        /// <term>Mocking</term>
-        /// <description>To mock this method, please mock <see cref="MockableSelfHelpArmClient.GetSelfHelpSimplifiedSolutions(ResourceIdentifier)"/> instead.</description>
+        /// <term> Mocking. </term>
+        /// <description> To mock this method, please mock <see cref="MockableSelfHelpArmClient.GetSelfHelpSolutions(ResourceIdentifier)"/> instead. </description>
         /// </item>
         /// </summary>
-        /// <param name="client"> The <see cref="ArmClient" /> instance the method will execute against. </param>
-        /// <param name="scope"> The scope that the resource will apply against. </param>
+        /// <param name="client"> The <see cref="ArmClient"/> the method will execute against. </param>
+        /// <param name="scope"> The scope of the resource collection to get. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="client"/> is null. </exception>
-        /// <returns> An object representing collection of SelfHelpSimplifiedSolutionResources and their operations over a SelfHelpSimplifiedSolutionResource. </returns>
-        public static SelfHelpSimplifiedSolutionCollection GetSelfHelpSimplifiedSolutions(this ArmClient client, ResourceIdentifier scope)
+        /// <returns> Returns a collection of <see cref="SelfHelpSolutionResource"/> objects. </returns>
+        public static SelfHelpSolutionCollection GetSelfHelpSolutions(this ArmClient client, ResourceIdentifier scope)
         {
             Argument.AssertNotNull(client, nameof(client));
 
-            return GetMockableSelfHelpArmClient(client).GetSelfHelpSimplifiedSolutions(scope);
+            return GetMockableSelfHelpArmClient(client).GetSelfHelpSolutions(scope);
         }
 
         /// <summary>
-        /// Get the simplified Solutions using the applicable solutionResourceName while creating the simplified Solutions.
-        /// <list type="bullet">
-        /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/simplifiedSolutions/{simplifiedSolutionsResourceName}</description>
-        /// </item>
-        /// <item>
-        /// <term>Operation Id</term>
-        /// <description>SimplifiedSolutionsResource_Get</description>
-        /// </item>
-        /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
-        /// </item>
-        /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpSimplifiedSolutionResource"/></description>
-        /// </item>
-        /// </list>
+        /// Get the solution using the applicable solutionResourceName while creating the solution.
         /// <item>
-        /// <term>Mocking</term>
-        /// <description>To mock this method, please mock <see cref="MockableSelfHelpArmClient.GetSelfHelpSimplifiedSolutionAsync(ResourceIdentifier,string,CancellationToken)"/> instead.</description>
+        /// <term> Mocking. </term>
+        /// <description> To mock this method, please mock <see cref="MockableSelfHelpArmClient.GetSelfHelpSolution(ResourceIdentifier, string, CancellationToken)"/> instead. </description>
         /// </item>
         /// </summary>
-        /// <param name="client"> The <see cref="ArmClient" /> instance the method will execute against. </param>
-        /// <param name="scope"> The scope that the resource will apply against. </param>
-        /// <param name="simplifiedSolutionsResourceName"> Simplified Solutions Resource Name. </param>
+        /// <param name="client"> The <see cref="ArmClient"/> the method will execute against. </param>
+        /// <param name="scope"> The scope of the resource collection to get. </param>
+        /// <param name="solutionResourceName"> Solution resource Name. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="client"/> or <paramref name="simplifiedSolutionsResourceName"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="simplifiedSolutionsResourceName"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="ArgumentNullException"> <paramref name="client"/> is null. </exception>
         [ForwardsClientCalls]
-        public static async Task<Response<SelfHelpSimplifiedSolutionResource>> GetSelfHelpSimplifiedSolutionAsync(this ArmClient client, ResourceIdentifier scope, string simplifiedSolutionsResourceName, CancellationToken cancellationToken = default)
+        public static Response<SelfHelpSolutionResource> GetSelfHelpSolution(this ArmClient client, ResourceIdentifier scope, string solutionResourceName, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(client, nameof(client));
 
-            return await GetMockableSelfHelpArmClient(client).GetSelfHelpSimplifiedSolutionAsync(scope, simplifiedSolutionsResourceName, cancellationToken).ConfigureAwait(false);
+            return GetMockableSelfHelpArmClient(client).GetSelfHelpSolution(scope, solutionResourceName, cancellationToken);
         }
 
         /// <summary>
-        /// Get the simplified Solutions using the applicable solutionResourceName while creating the simplified Solutions.
-        /// <list type="bullet">
-        /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/simplifiedSolutions/{simplifiedSolutionsResourceName}</description>
-        /// </item>
-        /// <item>
-        /// <term>Operation Id</term>
-        /// <description>SimplifiedSolutionsResource_Get</description>
-        /// </item>
-        /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
-        /// </item>
-        /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpSimplifiedSolutionResource"/></description>
-        /// </item>
-        /// </list>
+        /// Get the solution using the applicable solutionResourceName while creating the solution.
         /// <item>
-        /// <term>Mocking</term>
-        /// <description>To mock this method, please mock <see cref="MockableSelfHelpArmClient.GetSelfHelpSimplifiedSolution(ResourceIdentifier,string,CancellationToken)"/> instead.</description>
+        /// <term> Mocking. </term>
+        /// <description> To mock this method, please mock <see cref="MockableSelfHelpArmClient.GetSelfHelpSolutionAsync(ResourceIdentifier, string, CancellationToken)"/> instead. </description>
         /// </item>
         /// </summary>
-        /// <param name="client"> The <see cref="ArmClient" /> instance the method will execute against. </param>
-        /// <param name="scope"> The scope that the resource will apply against. </param>
-        /// <param name="simplifiedSolutionsResourceName"> Simplified Solutions Resource Name. </param>
+        /// <param name="client"> The <see cref="ArmClient"/> the method will execute against. </param>
+        /// <param name="scope"> The scope of the resource collection to get. </param>
+        /// <param name="solutionResourceName"> Solution resource Name. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="client"/> or <paramref name="simplifiedSolutionsResourceName"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="simplifiedSolutionsResourceName"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="ArgumentNullException"> <paramref name="client"/> is null. </exception>
         [ForwardsClientCalls]
-        public static Response<SelfHelpSimplifiedSolutionResource> GetSelfHelpSimplifiedSolution(this ArmClient client, ResourceIdentifier scope, string simplifiedSolutionsResourceName, CancellationToken cancellationToken = default)
+        public static async Task<Response<SelfHelpSolutionResource>> GetSelfHelpSolutionAsync(this ArmClient client, ResourceIdentifier scope, string solutionResourceName, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(client, nameof(client));
 
-            return GetMockableSelfHelpArmClient(client).GetSelfHelpSimplifiedSolution(scope, simplifiedSolutionsResourceName, cancellationToken);
+            return await GetMockableSelfHelpArmClient(client).GetSelfHelpSolutionAsync(scope, solutionResourceName, cancellationToken).ConfigureAwait(false);
         }
 
         /// <summary>
-        /// Gets a collection of SelfHelpTroubleshooterResources in the ArmClient.
+        /// Gets an object representing a <see cref="SelfHelpSimplifiedSolutionsResource"/> along with the instance operations that can be performed on it but with no data.
         /// <item>
-        /// <term>Mocking</term>
-        /// <description>To mock this method, please mock <see cref="MockableSelfHelpArmClient.GetSelfHelpTroubleshooters(ResourceIdentifier)"/> instead.</description>
+        /// <term> Mocking. </term>
+        /// <description> To mock this method, please mock <see cref="MockableSelfHelpArmClient.GetSelfHelpSimplifiedSolutionsResource(ResourceIdentifier)"/> instead. </description>
         /// </item>
         /// </summary>
-        /// <param name="client"> The <see cref="ArmClient" /> instance the method will execute against. </param>
-        /// <param name="scope"> The scope that the resource will apply against. </param>
+        /// <param name="client"> The <see cref="ArmClient"/> the method will execute against. </param>
+        /// <param name="id"> The resource ID of the resource to get. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="client"/> is null. </exception>
-        /// <returns> An object representing collection of SelfHelpTroubleshooterResources and their operations over a SelfHelpTroubleshooterResource. </returns>
-        public static SelfHelpTroubleshooterCollection GetSelfHelpTroubleshooters(this ArmClient client, ResourceIdentifier scope)
+        /// <returns> Returns a <see cref="SelfHelpSimplifiedSolutionsResource"/> object. </returns>
+        public static SelfHelpSimplifiedSolutionsResource GetSelfHelpSimplifiedSolutionsResource(this ArmClient client, ResourceIdentifier id)
         {
             Argument.AssertNotNull(client, nameof(client));
 
-            return GetMockableSelfHelpArmClient(client).GetSelfHelpTroubleshooters(scope);
+            return GetMockableSelfHelpArmClient(client).GetSelfHelpSimplifiedSolutionsResource(id);
         }
 
         /// <summary>
-        /// Gets troubleshooter instance result which includes the step status/result of the troubleshooter resource name that is being executed.&lt;br/&gt; Get API is used to retrieve the result of a Troubleshooter instance, which includes the status and result of each step in the Troubleshooter workflow. This API requires the Troubleshooter resource name that was created using the Create API.
-        /// <list type="bullet">
-        /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/troubleshooters/{troubleshooterName}</description>
-        /// </item>
-        /// <item>
-        /// <term>Operation Id</term>
-        /// <description>TroubleshooterResource_Get</description>
-        /// </item>
-        /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
-        /// </item>
-        /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpTroubleshooterResource"/></description>
-        /// </item>
-        /// </list>
+        /// Gets a collection of <see cref="SelfHelpSimplifiedSolutionsCollection"/> objects within the specified scope.
         /// <item>
-        /// <term>Mocking</term>
-        /// <description>To mock this method, please mock <see cref="MockableSelfHelpArmClient.GetSelfHelpTroubleshooterAsync(ResourceIdentifier,string,CancellationToken)"/> instead.</description>
+        /// <term> Mocking. </term>
+        /// <description> To mock this method, please mock <see cref="MockableSelfHelpArmClient.GetSelfHelpSimplifiedSolutions(ResourceIdentifier)"/> instead. </description>
         /// </item>
         /// </summary>
-        /// <param name="client"> The <see cref="ArmClient" /> instance the method will execute against. </param>
-        /// <param name="scope"> The scope that the resource will apply against. </param>
-        /// <param name="troubleshooterName"> Troubleshooter resource Name. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="client"/> or <paramref name="troubleshooterName"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="troubleshooterName"/> is an empty string, and was expected to be non-empty. </exception>
-        [ForwardsClientCalls]
-        public static async Task<Response<SelfHelpTroubleshooterResource>> GetSelfHelpTroubleshooterAsync(this ArmClient client, ResourceIdentifier scope, string troubleshooterName, CancellationToken cancellationToken = default)
+        /// <param name="client"> The <see cref="ArmClient"/> the method will execute against. </param>
+        /// <param name="scope"> The scope of the resource collection to get. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="client"/> is null. </exception>
+        /// <returns> Returns a collection of <see cref="SelfHelpSimplifiedSolutionsResource"/> objects. </returns>
+        public static SelfHelpSimplifiedSolutionsCollection GetSelfHelpSimplifiedSolutions(this ArmClient client, ResourceIdentifier scope)
         {
             Argument.AssertNotNull(client, nameof(client));
 
-            return await GetMockableSelfHelpArmClient(client).GetSelfHelpTroubleshooterAsync(scope, troubleshooterName, cancellationToken).ConfigureAwait(false);
+            return GetMockableSelfHelpArmClient(client).GetSelfHelpSimplifiedSolutions(scope);
         }
 
         /// <summary>
-        /// Gets troubleshooter instance result which includes the step status/result of the troubleshooter resource name that is being executed.&lt;br/&gt; Get API is used to retrieve the result of a Troubleshooter instance, which includes the status and result of each step in the Troubleshooter workflow. This API requires the Troubleshooter resource name that was created using the Create API.
-        /// <list type="bullet">
-        /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/troubleshooters/{troubleshooterName}</description>
-        /// </item>
-        /// <item>
-        /// <term>Operation Id</term>
-        /// <description>TroubleshooterResource_Get</description>
-        /// </item>
-        /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
-        /// </item>
-        /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpTroubleshooterResource"/></description>
-        /// </item>
-        /// </list>
+        /// Get the simplified Solutions using the applicable solutionResourceName while creating the simplified Solutions.
         /// <item>
-        /// <term>Mocking</term>
-        /// <description>To mock this method, please mock <see cref="MockableSelfHelpArmClient.GetSelfHelpTroubleshooter(ResourceIdentifier,string,CancellationToken)"/> instead.</description>
+        /// <term> Mocking. </term>
+        /// <description> To mock this method, please mock <see cref="MockableSelfHelpArmClient.GetSelfHelpSimplifiedSolutions(ResourceIdentifier, string, CancellationToken)"/> instead. </description>
         /// </item>
         /// </summary>
-        /// <param name="client"> The <see cref="ArmClient" /> instance the method will execute against. </param>
-        /// <param name="scope"> The scope that the resource will apply against. </param>
-        /// <param name="troubleshooterName"> Troubleshooter resource Name. </param>
+        /// <param name="client"> The <see cref="ArmClient"/> the method will execute against. </param>
+        /// <param name="scope"> The scope of the resource collection to get. </param>
+        /// <param name="simplifiedSolutionsResourceName"> Simplified Solutions Resource Name. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="client"/> or <paramref name="troubleshooterName"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="troubleshooterName"/> is an empty string, and was expected to be non-empty. </exception>
+        /// <exception cref="ArgumentNullException"> <paramref name="client"/> is null. </exception>
         [ForwardsClientCalls]
-        public static Response<SelfHelpTroubleshooterResource> GetSelfHelpTroubleshooter(this ArmClient client, ResourceIdentifier scope, string troubleshooterName, CancellationToken cancellationToken = default)
+        public static Response<SelfHelpSimplifiedSolutionsResource> GetSelfHelpSimplifiedSolutions(this ArmClient client, ResourceIdentifier scope, string simplifiedSolutionsResourceName, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(client, nameof(client));
 
-            return GetMockableSelfHelpArmClient(client).GetSelfHelpTroubleshooter(scope, troubleshooterName, cancellationToken);
+            return GetMockableSelfHelpArmClient(client).GetSelfHelpSimplifiedSolutions(scope, simplifiedSolutionsResourceName, cancellationToken);
         }
 
         /// <summary>
-        /// This API is used to check the uniqueness of a resource name used for a diagnostic, troubleshooter or solutions
-        /// <list type="bullet">
-        /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/checkNameAvailability</description>
-        /// </item>
-        /// <item>
-        /// <term>Operation Id</term>
-        /// <description>CheckNameAvailabilityOperationGroup_CheckSelfHelpNameAvailability</description>
-        /// </item>
-        /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
-        /// </item>
-        /// </list>
+        /// Get the simplified Solutions using the applicable solutionResourceName while creating the simplified Solutions.
         /// <item>
-        /// <term>Mocking</term>
-        /// <description>To mock this method, please mock <see cref="MockableSelfHelpArmClient.CheckSelfHelpNameAvailability(ResourceIdentifier,SelfHelpNameAvailabilityContent,CancellationToken)"/> instead.</description>
+        /// <term> Mocking. </term>
+        /// <description> To mock this method, please mock <see cref="MockableSelfHelpArmClient.GetSelfHelpSimplifiedSolutionsAsync(ResourceIdentifier, string, CancellationToken)"/> instead. </description>
         /// </item>
         /// </summary>
-        /// <param name="client"> The <see cref="ArmClient" /> instance the method will execute against. </param>
-        /// <param name="scope"> The scope that the resource will apply against. </param>
-        /// <param name="content"> The required parameters for availability check. </param>
+        /// <param name="client"> The <see cref="ArmClient"/> the method will execute against. </param>
+        /// <param name="scope"> The scope of the resource collection to get. </param>
+        /// <param name="simplifiedSolutionsResourceName"> Simplified Solutions Resource Name. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="client"/> is null. </exception>
-        public static async Task<Response<SelfHelpNameAvailabilityResult>> CheckSelfHelpNameAvailabilityAsync(this ArmClient client, ResourceIdentifier scope, SelfHelpNameAvailabilityContent content = null, CancellationToken cancellationToken = default)
+        [ForwardsClientCalls]
+        public static async Task<Response<SelfHelpSimplifiedSolutionsResource>> GetSelfHelpSimplifiedSolutionsAsync(this ArmClient client, ResourceIdentifier scope, string simplifiedSolutionsResourceName, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(client, nameof(client));
 
-            return await GetMockableSelfHelpArmClient(client).CheckSelfHelpNameAvailabilityAsync(scope, content, cancellationToken).ConfigureAwait(false);
+            return await GetMockableSelfHelpArmClient(client).GetSelfHelpSimplifiedSolutionsAsync(scope, simplifiedSolutionsResourceName, cancellationToken).ConfigureAwait(false);
         }
 
         /// <summary>
-        /// This API is used to check the uniqueness of a resource name used for a diagnostic, troubleshooter or solutions
-        /// <list type="bullet">
-        /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/checkNameAvailability</description>
-        /// </item>
-        /// <item>
-        /// <term>Operation Id</term>
-        /// <description>CheckNameAvailabilityOperationGroup_CheckSelfHelpNameAvailability</description>
-        /// </item>
+        /// Gets an object representing a <see cref="SelfHelpTroubleshooterResource"/> along with the instance operations that can be performed on it but with no data.
         /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
-        /// </item>
-        /// </list>
-        /// <item>
-        /// <term>Mocking</term>
-        /// <description>To mock this method, please mock <see cref="MockableSelfHelpArmClient.CheckSelfHelpNameAvailability(ResourceIdentifier,SelfHelpNameAvailabilityContent,CancellationToken)"/> instead.</description>
+        /// <term> Mocking. </term>
+        /// <description> To mock this method, please mock <see cref="MockableSelfHelpArmClient.GetSelfHelpTroubleshooterResource(ResourceIdentifier)"/> instead. </description>
         /// </item>
         /// </summary>
-        /// <param name="client"> The <see cref="ArmClient" /> instance the method will execute against. </param>
-        /// <param name="scope"> The scope that the resource will apply against. </param>
-        /// <param name="content"> The required parameters for availability check. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <param name="client"> The <see cref="ArmClient"/> the method will execute against. </param>
+        /// <param name="id"> The resource ID of the resource to get. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="client"/> is null. </exception>
-        public static Response<SelfHelpNameAvailabilityResult> CheckSelfHelpNameAvailability(this ArmClient client, ResourceIdentifier scope, SelfHelpNameAvailabilityContent content = null, CancellationToken cancellationToken = default)
+        /// <returns> Returns a <see cref="SelfHelpTroubleshooterResource"/> object. </returns>
+        public static SelfHelpTroubleshooterResource GetSelfHelpTroubleshooterResource(this ArmClient client, ResourceIdentifier id)
         {
             Argument.AssertNotNull(client, nameof(client));
 
-            return GetMockableSelfHelpArmClient(client).CheckSelfHelpNameAvailability(scope, content, cancellationToken);
+            return GetMockableSelfHelpArmClient(client).GetSelfHelpTroubleshooterResource(id);
         }
 
         /// <summary>
-        /// Gets an object representing a <see cref="SelfHelpDiagnosticResource" /> along with the instance operations that can be performed on it but with no data.
-        /// You can use <see cref="SelfHelpDiagnosticResource.CreateResourceIdentifier" /> to create a <see cref="SelfHelpDiagnosticResource" /> <see cref="ResourceIdentifier" /> from its components.
+        /// Gets a collection of <see cref="SelfHelpTroubleshooterCollection"/> objects within the specified scope.
         /// <item>
-        /// <term>Mocking</term>
-        /// <description>To mock this method, please mock <see cref="MockableSelfHelpArmClient.GetSelfHelpDiagnosticResource(ResourceIdentifier)"/> instead.</description>
+        /// <term> Mocking. </term>
+        /// <description> To mock this method, please mock <see cref="MockableSelfHelpArmClient.GetSelfHelpTroubleshooters(ResourceIdentifier)"/> instead. </description>
         /// </item>
         /// </summary>
-        /// <param name="client"> The <see cref="ArmClient" /> instance the method will execute against. </param>
-        /// <param name="id"> The resource ID of the resource to get. </param>
+        /// <param name="client"> The <see cref="ArmClient"/> the method will execute against. </param>
+        /// <param name="scope"> The scope of the resource collection to get. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="client"/> is null. </exception>
-        /// <returns> Returns a <see cref="SelfHelpDiagnosticResource"/> object. </returns>
-        public static SelfHelpDiagnosticResource GetSelfHelpDiagnosticResource(this ArmClient client, ResourceIdentifier id)
+        /// <returns> Returns a collection of <see cref="SelfHelpTroubleshooterResource"/> objects. </returns>
+        public static SelfHelpTroubleshooterCollection GetSelfHelpTroubleshooters(this ArmClient client, ResourceIdentifier scope)
         {
             Argument.AssertNotNull(client, nameof(client));
 
-            return GetMockableSelfHelpArmClient(client).GetSelfHelpDiagnosticResource(id);
+            return GetMockableSelfHelpArmClient(client).GetSelfHelpTroubleshooters(scope);
         }
 
         /// <summary>
-        /// Gets an object representing a <see cref="SelfHelpSolutionResource" /> along with the instance operations that can be performed on it but with no data.
-        /// You can use <see cref="SelfHelpSolutionResource.CreateResourceIdentifier" /> to create a <see cref="SelfHelpSolutionResource" /> <see cref="ResourceIdentifier" /> from its components.
+        /// Gets troubleshooter instance result which includes the step status/result of the troubleshooter resource name that is being executed.&lt;br/&gt; Get API is used to retrieve the result of a Troubleshooter instance, which includes the status and result of each step in the Troubleshooter workflow. This API requires the Troubleshooter resource name that was created using the Create API.
         /// <item>
-        /// <term>Mocking</term>
-        /// <description>To mock this method, please mock <see cref="MockableSelfHelpArmClient.GetSelfHelpSolutionResource(ResourceIdentifier)"/> instead.</description>
+        /// <term> Mocking. </term>
+        /// <description> To mock this method, please mock <see cref="MockableSelfHelpArmClient.GetSelfHelpTroubleshooter(ResourceIdentifier, string, CancellationToken)"/> instead. </description>
         /// </item>
         /// </summary>
-        /// <param name="client"> The <see cref="ArmClient" /> instance the method will execute against. </param>
-        /// <param name="id"> The resource ID of the resource to get. </param>
+        /// <param name="client"> The <see cref="ArmClient"/> the method will execute against. </param>
+        /// <param name="scope"> The scope of the resource collection to get. </param>
+        /// <param name="troubleshooterName"> Troubleshooter resource Name. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="client"/> is null. </exception>
-        /// <returns> Returns a <see cref="SelfHelpSolutionResource"/> object. </returns>
-        public static SelfHelpSolutionResource GetSelfHelpSolutionResource(this ArmClient client, ResourceIdentifier id)
+        [ForwardsClientCalls]
+        public static Response<SelfHelpTroubleshooterResource> GetSelfHelpTroubleshooter(this ArmClient client, ResourceIdentifier scope, string troubleshooterName, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(client, nameof(client));
 
-            return GetMockableSelfHelpArmClient(client).GetSelfHelpSolutionResource(id);
+            return GetMockableSelfHelpArmClient(client).GetSelfHelpTroubleshooter(scope, troubleshooterName, cancellationToken);
         }
 
         /// <summary>
-        /// Gets an object representing a <see cref="SelfHelpSimplifiedSolutionResource" /> along with the instance operations that can be performed on it but with no data.
-        /// You can use <see cref="SelfHelpSimplifiedSolutionResource.CreateResourceIdentifier" /> to create a <see cref="SelfHelpSimplifiedSolutionResource" /> <see cref="ResourceIdentifier" /> from its components.
+        /// Gets troubleshooter instance result which includes the step status/result of the troubleshooter resource name that is being executed.&lt;br/&gt; Get API is used to retrieve the result of a Troubleshooter instance, which includes the status and result of each step in the Troubleshooter workflow. This API requires the Troubleshooter resource name that was created using the Create API.
         /// <item>
-        /// <term>Mocking</term>
-        /// <description>To mock this method, please mock <see cref="MockableSelfHelpArmClient.GetSelfHelpSimplifiedSolutionResource(ResourceIdentifier)"/> instead.</description>
+        /// <term> Mocking. </term>
+        /// <description> To mock this method, please mock <see cref="MockableSelfHelpArmClient.GetSelfHelpTroubleshooterAsync(ResourceIdentifier, string, CancellationToken)"/> instead. </description>
         /// </item>
         /// </summary>
-        /// <param name="client"> The <see cref="ArmClient" /> instance the method will execute against. </param>
-        /// <param name="id"> The resource ID of the resource to get. </param>
+        /// <param name="client"> The <see cref="ArmClient"/> the method will execute against. </param>
+        /// <param name="scope"> The scope of the resource collection to get. </param>
+        /// <param name="troubleshooterName"> Troubleshooter resource Name. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="client"/> is null. </exception>
-        /// <returns> Returns a <see cref="SelfHelpSimplifiedSolutionResource"/> object. </returns>
-        public static SelfHelpSimplifiedSolutionResource GetSelfHelpSimplifiedSolutionResource(this ArmClient client, ResourceIdentifier id)
+        [ForwardsClientCalls]
+        public static async Task<Response<SelfHelpTroubleshooterResource>> GetSelfHelpTroubleshooterAsync(this ArmClient client, ResourceIdentifier scope, string troubleshooterName, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(client, nameof(client));
 
-            return GetMockableSelfHelpArmClient(client).GetSelfHelpSimplifiedSolutionResource(id);
+            return await GetMockableSelfHelpArmClient(client).GetSelfHelpTroubleshooterAsync(scope, troubleshooterName, cancellationToken).ConfigureAwait(false);
         }
 
         /// <summary>
-        /// Gets an object representing a <see cref="SelfHelpTroubleshooterResource" /> along with the instance operations that can be performed on it but with no data.
-        /// You can use <see cref="SelfHelpTroubleshooterResource.CreateResourceIdentifier" /> to create a <see cref="SelfHelpTroubleshooterResource" /> <see cref="ResourceIdentifier" /> from its components.
+        /// Gets an object representing a <see cref="SelfHelpSolutionResultResource"/> along with the instance operations that can be performed on it but with no data.
         /// <item>
-        /// <term>Mocking</term>
-        /// <description>To mock this method, please mock <see cref="MockableSelfHelpArmClient.GetSelfHelpTroubleshooterResource(ResourceIdentifier)"/> instead.</description>
+        /// <term> Mocking. </term>
+        /// <description> To mock this method, please mock <see cref="MockableSelfHelpArmClient.GetSelfHelpSolutionResultResource(ResourceIdentifier)"/> instead. </description>
         /// </item>
         /// </summary>
-        /// <param name="client"> The <see cref="ArmClient" /> instance the method will execute against. </param>
+        /// <param name="client"> The <see cref="ArmClient"/> the method will execute against. </param>
         /// <param name="id"> The resource ID of the resource to get. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="client"/> is null. </exception>
-        /// <returns> Returns a <see cref="SelfHelpTroubleshooterResource"/> object. </returns>
-        public static SelfHelpTroubleshooterResource GetSelfHelpTroubleshooterResource(this ArmClient client, ResourceIdentifier id)
+        /// <returns> Returns a <see cref="SelfHelpSolutionResultResource"/> object. </returns>
+        public static SelfHelpSolutionResultResource GetSelfHelpSolutionResultResource(this ArmClient client, ResourceIdentifier id)
         {
             Argument.AssertNotNull(client, nameof(client));
 
-            return GetMockableSelfHelpArmClient(client).GetSelfHelpTroubleshooterResource(id);
+            return GetMockableSelfHelpArmClient(client).GetSelfHelpSolutionResultResource(id);
         }
 
         /// <summary>
         /// Search for relevant Azure Diagnostics, Solutions and Troubleshooters using a natural language issue summary and subscription.
-        /// <list type="bullet">
-        /// <item>
-        /// <term>Request Path</term>
-        /// <description>/subscriptions/{subscriptionId}/providers/Microsoft.Help/discoverSolutions</description>
-        /// </item>
-        /// <item>
-        /// <term>Operation Id</term>
-        /// <description>DiscoverySolutionNLPOperationGroup_DiscoverSolutionsNlp</description>
-        /// </item>
-        /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
-        /// </item>
-        /// </list>
         /// <item>
-        /// <term>Mocking</term>
-        /// <description>To mock this method, please mock <see cref="MockableSelfHelpSubscriptionResource.DiscoverSolutionsNlp(DiscoveryNlpContent,CancellationToken)"/> instead.</description>
+        /// <term> Mocking. </term>
+        /// <description> To mock this method, please mock <see cref="MockableSelfHelpSubscriptionResource.DiscoverSolutionsNlpAsync(DiscoveryNlpContent, CancellationToken)"/> instead. </description>
         /// </item>
         /// </summary>
-        /// <param name="subscriptionResource"> The <see cref="SubscriptionResource" /> instance the method will execute against. </param>
-        /// <param name="content"> The request body. </param>
+        /// <param name="subscriptionResource"> The <see cref="SubscriptionResource"/> the method will execute against. </param>
+        /// <param name="discoverSolutionRequest"> The request body. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="subscriptionResource"/> is null. </exception>
-        /// <returns> An async collection of <see cref="SolutionNlpMetadata"/> that may take multiple service requests to iterate over. </returns>
-        public static AsyncPageable<SolutionNlpMetadata> DiscoverSolutionsNlpAsync(this SubscriptionResource subscriptionResource, DiscoveryNlpContent content = null, CancellationToken cancellationToken = default)
+        public static async Task<Response<DiscoveryNlpResult>> DiscoverSolutionsNlpAsync(this SubscriptionResource subscriptionResource, DiscoveryNlpContent discoverSolutionRequest = default, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(subscriptionResource, nameof(subscriptionResource));
 
-            return GetMockableSelfHelpSubscriptionResource(subscriptionResource).DiscoverSolutionsNlpAsync(content, cancellationToken);
+            return await GetMockableSelfHelpSubscriptionResource(subscriptionResource).DiscoverSolutionsNlpAsync(discoverSolutionRequest, cancellationToken).ConfigureAwait(false);
         }
 
         /// <summary>
         /// Search for relevant Azure Diagnostics, Solutions and Troubleshooters using a natural language issue summary and subscription.
-        /// <list type="bullet">
-        /// <item>
-        /// <term>Request Path</term>
-        /// <description>/subscriptions/{subscriptionId}/providers/Microsoft.Help/discoverSolutions</description>
-        /// </item>
-        /// <item>
-        /// <term>Operation Id</term>
-        /// <description>DiscoverySolutionNLPOperationGroup_DiscoverSolutionsNlp</description>
-        /// </item>
-        /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
-        /// </item>
-        /// </list>
         /// <item>
-        /// <term>Mocking</term>
-        /// <description>To mock this method, please mock <see cref="MockableSelfHelpSubscriptionResource.DiscoverSolutionsNlp(DiscoveryNlpContent,CancellationToken)"/> instead.</description>
+        /// <term> Mocking. </term>
+        /// <description> To mock this method, please mock <see cref="MockableSelfHelpSubscriptionResource.DiscoverSolutionsNlp(DiscoveryNlpContent, CancellationToken)"/> instead. </description>
         /// </item>
         /// </summary>
-        /// <param name="subscriptionResource"> The <see cref="SubscriptionResource" /> instance the method will execute against. </param>
-        /// <param name="content"> The request body. </param>
+        /// <param name="subscriptionResource"> The <see cref="SubscriptionResource"/> the method will execute against. </param>
+        /// <param name="discoverSolutionRequest"> The request body. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="subscriptionResource"/> is null. </exception>
-        /// <returns> A collection of <see cref="SolutionNlpMetadata"/> that may take multiple service requests to iterate over. </returns>
-        public static Pageable<SolutionNlpMetadata> DiscoverSolutionsNlp(this SubscriptionResource subscriptionResource, DiscoveryNlpContent content = null, CancellationToken cancellationToken = default)
+        public static Response<DiscoveryNlpResult> DiscoverSolutionsNlp(this SubscriptionResource subscriptionResource, DiscoveryNlpContent discoverSolutionRequest = default, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(subscriptionResource, nameof(subscriptionResource));
 
-            return GetMockableSelfHelpSubscriptionResource(subscriptionResource).DiscoverSolutionsNlp(content, cancellationToken);
+            return GetMockableSelfHelpSubscriptionResource(subscriptionResource).DiscoverSolutionsNlp(discoverSolutionRequest, cancellationToken);
         }
 
         /// <summary>
-        /// Search for relevant Azure Diagnostics, Solutions and Troubleshooters using a natural language issue summary.
-        /// <list type="bullet">
-        /// <item>
-        /// <term>Request Path</term>
-        /// <description>/providers/Microsoft.Help/discoverSolutions</description>
-        /// </item>
+        /// Gets a collection of SelfHelpSolutionResults in the <see cref="TenantResource"/>
         /// <item>
-        /// <term>Operation Id</term>
-        /// <description>DiscoverySolutionNLPOperationGroup_DiscoverSolutionsNlp</description>
-        /// </item>
-        /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
-        /// </item>
-        /// </list>
-        /// <item>
-        /// <term>Mocking</term>
-        /// <description>To mock this method, please mock <see cref="MockableSelfHelpTenantResource.DiscoverSolutionsNlp(DiscoveryNlpContent,CancellationToken)"/> instead.</description>
+        /// <term> Mocking. </term>
+        /// <description> To mock this method, please mock <see cref="MockableSelfHelpTenantResource.GetSelfHelpSolutionResults()"/> instead. </description>
         /// </item>
         /// </summary>
-        /// <param name="tenantResource"> The <see cref="TenantResource" /> instance the method will execute against. </param>
-        /// <param name="content"> The request body. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <param name="tenantResource"> The <see cref="TenantResource"/> the method will execute against. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="tenantResource"/> is null. </exception>
-        /// <returns> An async collection of <see cref="SolutionNlpMetadata"/> that may take multiple service requests to iterate over. </returns>
-        public static AsyncPageable<SolutionNlpMetadata> DiscoverSolutionsNlpAsync(this TenantResource tenantResource, DiscoveryNlpContent content = null, CancellationToken cancellationToken = default)
+        /// <returns> An object representing collection of SelfHelpSolutionResults and their operations over a SelfHelpSolutionResultResource. </returns>
+        public static SelfHelpSolutionResultCollection GetSelfHelpSolutionResults(this TenantResource tenantResource)
         {
             Argument.AssertNotNull(tenantResource, nameof(tenantResource));
 
-            return GetMockableSelfHelpTenantResource(tenantResource).DiscoverSolutionsNlpAsync(content, cancellationToken);
+            return GetMockableSelfHelpTenantResource(tenantResource).GetSelfHelpSolutionResults();
         }
 
         /// <summary>
         /// Search for relevant Azure Diagnostics, Solutions and Troubleshooters using a natural language issue summary.
-        /// <list type="bullet">
-        /// <item>
-        /// <term>Request Path</term>
-        /// <description>/providers/Microsoft.Help/discoverSolutions</description>
-        /// </item>
-        /// <item>
-        /// <term>Operation Id</term>
-        /// <description>DiscoverySolutionNLPOperationGroup_DiscoverSolutionsNlp</description>
-        /// </item>
-        /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
-        /// </item>
-        /// </list>
         /// <item>
-        /// <term>Mocking</term>
-        /// <description>To mock this method, please mock <see cref="MockableSelfHelpTenantResource.DiscoverSolutionsNlp(DiscoveryNlpContent,CancellationToken)"/> instead.</description>
+        /// <term> Mocking. </term>
+        /// <description> To mock this method, please mock <see cref="MockableSelfHelpTenantResource.DiscoverSolutionsNlpAsync(DiscoveryNlpContent, CancellationToken)"/> instead. </description>
         /// </item>
         /// </summary>
-        /// <param name="tenantResource"> The <see cref="TenantResource" /> instance the method will execute against. </param>
-        /// <param name="content"> The request body. </param>
+        /// <param name="tenantResource"> The <see cref="TenantResource"/> the method will execute against. </param>
+        /// <param name="discoverSolutionRequest"> The request body. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="tenantResource"/> is null. </exception>
-        /// <returns> A collection of <see cref="SolutionNlpMetadata"/> that may take multiple service requests to iterate over. </returns>
-        public static Pageable<SolutionNlpMetadata> DiscoverSolutionsNlp(this TenantResource tenantResource, DiscoveryNlpContent content = null, CancellationToken cancellationToken = default)
-        {
-            Argument.AssertNotNull(tenantResource, nameof(tenantResource));
-
-            return GetMockableSelfHelpTenantResource(tenantResource).DiscoverSolutionsNlp(content, cancellationToken);
-        }
-
-        /// <summary>
-        /// Gets Self Help Solutions for a given solutionId. Self Help Solutions consist of rich instructional video tutorials, links and guides to public documentation related to a specific problem that enables users to troubleshoot Azure issues.
-        /// <list type="bullet">
-        /// <item>
-        /// <term>Request Path</term>
-        /// <description>/providers/Microsoft.Help/selfHelp/{solutionId}</description>
-        /// </item>
-        /// <item>
-        /// <term>Operation Id</term>
-        /// <description>SolutionResourceSelfHelp_GetSelfHelpSolutionById</description>
-        /// </item>
-        /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
-        /// </item>
-        /// </list>
-        /// <item>
-        /// <term>Mocking</term>
-        /// <description>To mock this method, please mock <see cref="MockableSelfHelpTenantResource.GetSelfHelpSolutionById(string,CancellationToken)"/> instead.</description>
-        /// </item>
-        /// </summary>
-        /// <param name="tenantResource"> The <see cref="TenantResource" /> instance the method will execute against. </param>
-        /// <param name="solutionId"> SolutionId is a unique id to identify a solution. You can retrieve the solution id using the Discovery api - https://learn.microsoft.com/en-us/rest/api/help/discovery-solution/list?view=rest-help-2023-09-01-preview&amp;tabs=HTTP. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentException"> <paramref name="solutionId"/> is an empty string, and was expected to be non-empty. </exception>
-        /// <exception cref="ArgumentNullException"> <paramref name="tenantResource"/> or <paramref name="solutionId"/> is null. </exception>
-        public static async Task<Response<SelfHelpSolutionResult>> GetSelfHelpSolutionByIdAsync(this TenantResource tenantResource, string solutionId, CancellationToken cancellationToken = default)
+        public static async Task<Response<DiscoveryNlpResult>> DiscoverSolutionsNlpAsync(this TenantResource tenantResource, DiscoveryNlpContent discoverSolutionRequest = default, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(tenantResource, nameof(tenantResource));
 
-            return await GetMockableSelfHelpTenantResource(tenantResource).GetSelfHelpSolutionByIdAsync(solutionId, cancellationToken).ConfigureAwait(false);
+            return await GetMockableSelfHelpTenantResource(tenantResource).DiscoverSolutionsNlpAsync(discoverSolutionRequest, cancellationToken).ConfigureAwait(false);
         }
 
         /// <summary>
-        /// Gets Self Help Solutions for a given solutionId. Self Help Solutions consist of rich instructional video tutorials, links and guides to public documentation related to a specific problem that enables users to troubleshoot Azure issues.
-        /// <list type="bullet">
-        /// <item>
-        /// <term>Request Path</term>
-        /// <description>/providers/Microsoft.Help/selfHelp/{solutionId}</description>
-        /// </item>
-        /// <item>
-        /// <term>Operation Id</term>
-        /// <description>SolutionResourceSelfHelp_GetSelfHelpSolutionById</description>
-        /// </item>
-        /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
-        /// </item>
-        /// </list>
+        /// Search for relevant Azure Diagnostics, Solutions and Troubleshooters using a natural language issue summary.
         /// <item>
-        /// <term>Mocking</term>
-        /// <description>To mock this method, please mock <see cref="MockableSelfHelpTenantResource.GetSelfHelpSolutionById(string,CancellationToken)"/> instead.</description>
+        /// <term> Mocking. </term>
+        /// <description> To mock this method, please mock <see cref="MockableSelfHelpTenantResource.DiscoverSolutionsNlp(DiscoveryNlpContent, CancellationToken)"/> instead. </description>
         /// </item>
         /// </summary>
-        /// <param name="tenantResource"> The <see cref="TenantResource" /> instance the method will execute against. </param>
-        /// <param name="solutionId"> SolutionId is a unique id to identify a solution. You can retrieve the solution id using the Discovery api - https://learn.microsoft.com/en-us/rest/api/help/discovery-solution/list?view=rest-help-2023-09-01-preview&amp;tabs=HTTP. </param>
+        /// <param name="tenantResource"> The <see cref="TenantResource"/> the method will execute against. </param>
+        /// <param name="discoverSolutionRequest"> The request body. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentException"> <paramref name="solutionId"/> is an empty string, and was expected to be non-empty. </exception>
-        /// <exception cref="ArgumentNullException"> <paramref name="tenantResource"/> or <paramref name="solutionId"/> is null. </exception>
-        public static Response<SelfHelpSolutionResult> GetSelfHelpSolutionById(this TenantResource tenantResource, string solutionId, CancellationToken cancellationToken = default)
+        /// <exception cref="ArgumentNullException"> <paramref name="tenantResource"/> is null. </exception>
+        public static Response<DiscoveryNlpResult> DiscoverSolutionsNlp(this TenantResource tenantResource, DiscoveryNlpContent discoverSolutionRequest = default, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(tenantResource, nameof(tenantResource));
 
-            return GetMockableSelfHelpTenantResource(tenantResource).GetSelfHelpSolutionById(solutionId, cancellationToken);
+            return GetMockableSelfHelpTenantResource(tenantResource).DiscoverSolutionsNlp(discoverSolutionRequest, cancellationToken);
         }
 
         /// <summary>
         /// Lists the relevant Azure Diagnostics, Solutions and Troubleshooters using [problemClassification API](https://learn.microsoft.com/rest/api/support/problem-classifications/list?tabs=HTTP)) AND  resourceUri or resourceType.&lt;br/&gt; Discovery Solutions is the initial entry point within Help API, which identifies relevant Azure diagnostics and solutions. &lt;br/&gt;&lt;br/&gt; Required Input :  problemClassificationId (Use the [problemClassification API](https://learn.microsoft.com/rest/api/support/problem-classifications/list?tabs=HTTP)) &lt;br/&gt;Optional input: resourceUri OR resource Type &lt;br/&gt;&lt;br/&gt; &lt;b&gt;Note: &lt;/b&gt;  ‘requiredInputs’ from Discovery solutions response must be passed via ‘additionalParameters’ as an input to Diagnostics and Solutions API.
-        /// <list type="bullet">
-        /// <item>
-        /// <term>Request Path</term>
-        /// <description>/providers/Microsoft.Help/discoverySolutions</description>
-        /// </item>
-        /// <item>
-        /// <term>Operation Id</term>
-        /// <description>DiscoverySolutionOperationGroup_DiscoverSolutions</description>
-        /// </item>
-        /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
-        /// </item>
-        /// </list>
         /// <item>
-        /// <term>Mocking</term>
-        /// <description>To mock this method, please mock <see cref="MockableSelfHelpTenantResource.DiscoverSolutions(string,string,CancellationToken)"/> instead.</description>
+        /// <term> Mocking. </term>
+        /// <description> To mock this method, please mock <see cref="MockableSelfHelpTenantResource.DiscoverSolutionsAsync(string, string, CancellationToken)"/> instead. </description>
         /// </item>
         /// </summary>
-        /// <param name="tenantResource"> The <see cref="TenantResource" /> instance the method will execute against. </param>
+        /// <param name="tenantResource"> The <see cref="TenantResource"/> the method will execute against. </param>
         /// <param name="filter"> 'ProblemClassificationId' is a mandatory filter to get solutions ids. It also supports optional 'ResourceType' and 'SolutionType' filters. The [$filter](https://learn.microsoft.com/en-us/odata/webapi/first-odata-api#filter) supports only 'and', 'or' and 'eq' operators. Example: $filter=ProblemClassificationId eq '1ddda5b4-cf6c-4d4f-91ad-bc38ab0e811e'. </param>
         /// <param name="skiptoken"> Skiptoken is only used if a previous operation returned a partial result. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="tenantResource"/> is null. </exception>
-        /// <returns> An async collection of <see cref="SelfHelpSolutionMetadata"/> that may take multiple service requests to iterate over. </returns>
-        public static AsyncPageable<SelfHelpSolutionMetadata> DiscoverSolutionsAsync(this TenantResource tenantResource, string filter = null, string skiptoken = null, CancellationToken cancellationToken = default)
+        /// <returns> A collection of <see cref="SelfHelpSolutionMetadata"/> that may take multiple service requests to iterate over. </returns>
+        public static AsyncPageable<SelfHelpSolutionMetadata> DiscoverSolutionsAsync(this TenantResource tenantResource, string filter = default, string skiptoken = default, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(tenantResource, nameof(tenantResource));
 
@@ -793,32 +471,18 @@ public static AsyncPageable<SelfHelpSolutionMetadata> DiscoverSolutionsAsync(thi
 
         /// <summary>
         /// Lists the relevant Azure Diagnostics, Solutions and Troubleshooters using [problemClassification API](https://learn.microsoft.com/rest/api/support/problem-classifications/list?tabs=HTTP)) AND  resourceUri or resourceType.&lt;br/&gt; Discovery Solutions is the initial entry point within Help API, which identifies relevant Azure diagnostics and solutions. &lt;br/&gt;&lt;br/&gt; Required Input :  problemClassificationId (Use the [problemClassification API](https://learn.microsoft.com/rest/api/support/problem-classifications/list?tabs=HTTP)) &lt;br/&gt;Optional input: resourceUri OR resource Type &lt;br/&gt;&lt;br/&gt; &lt;b&gt;Note: &lt;/b&gt;  ‘requiredInputs’ from Discovery solutions response must be passed via ‘additionalParameters’ as an input to Diagnostics and Solutions API.
-        /// <list type="bullet">
-        /// <item>
-        /// <term>Request Path</term>
-        /// <description>/providers/Microsoft.Help/discoverySolutions</description>
-        /// </item>
-        /// <item>
-        /// <term>Operation Id</term>
-        /// <description>DiscoverySolutionOperationGroup_DiscoverSolutions</description>
-        /// </item>
-        /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
-        /// </item>
-        /// </list>
         /// <item>
-        /// <term>Mocking</term>
-        /// <description>To mock this method, please mock <see cref="MockableSelfHelpTenantResource.DiscoverSolutions(string,string,CancellationToken)"/> instead.</description>
+        /// <term> Mocking. </term>
+        /// <description> To mock this method, please mock <see cref="MockableSelfHelpTenantResource.DiscoverSolutions(string, string, CancellationToken)"/> instead. </description>
         /// </item>
         /// </summary>
-        /// <param name="tenantResource"> The <see cref="TenantResource" /> instance the method will execute against. </param>
+        /// <param name="tenantResource"> The <see cref="TenantResource"/> the method will execute against. </param>
         /// <param name="filter"> 'ProblemClassificationId' is a mandatory filter to get solutions ids. It also supports optional 'ResourceType' and 'SolutionType' filters. The [$filter](https://learn.microsoft.com/en-us/odata/webapi/first-odata-api#filter) supports only 'and', 'or' and 'eq' operators. Example: $filter=ProblemClassificationId eq '1ddda5b4-cf6c-4d4f-91ad-bc38ab0e811e'. </param>
         /// <param name="skiptoken"> Skiptoken is only used if a previous operation returned a partial result. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="tenantResource"/> is null. </exception>
         /// <returns> A collection of <see cref="SelfHelpSolutionMetadata"/> that may take multiple service requests to iterate over. </returns>
-        public static Pageable<SelfHelpSolutionMetadata> DiscoverSolutions(this TenantResource tenantResource, string filter = null, string skiptoken = null, CancellationToken cancellationToken = default)
+        public static Pageable<SelfHelpSolutionMetadata> DiscoverSolutions(this TenantResource tenantResource, string filter = default, string skiptoken = default, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNull(tenantResource, nameof(tenantResource));
 
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Internal/Argument.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Internal/Argument.cs
index b26ad8233e4d..9027f39a257c 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Internal/Argument.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Internal/Argument.cs
@@ -11,8 +11,10 @@
 
 namespace Azure.ResourceManager.SelfHelp
 {
-    internal static class Argument
+    internal static partial class Argument
     {
+        /// <param name="value"> The value. </param>
+        /// <param name="name"> The name. </param>
         public static void AssertNotNull<T>(T value, string name)
         {
             if (value is null)
@@ -21,8 +23,10 @@ public static void AssertNotNull<T>(T value, string name)
             }
         }
 
+        /// <param name="value"> The value. </param>
+        /// <param name="name"> The name. </param>
         public static void AssertNotNull<T>(T? value, string name)
-        where T : struct
+            where T : struct
         {
             if (!value.HasValue)
             {
@@ -30,6 +34,8 @@ public static void AssertNotNull<T>(T? value, string name)
             }
         }
 
+        /// <param name="value"> The value. </param>
+        /// <param name="name"> The name. </param>
         public static void AssertNotNullOrEmpty<T>(IEnumerable<T> value, string name)
         {
             if (value is null)
@@ -51,6 +57,8 @@ public static void AssertNotNullOrEmpty<T>(IEnumerable<T> value, string name)
             }
         }
 
+        /// <param name="value"> The value. </param>
+        /// <param name="name"> The name. </param>
         public static void AssertNotNullOrEmpty(string value, string name)
         {
             if (value is null)
@@ -62,68 +70,5 @@ public static void AssertNotNullOrEmpty(string value, string name)
                 throw new ArgumentException("Value cannot be an empty string.", name);
             }
         }
-
-        public static void AssertNotNullOrWhiteSpace(string value, string name)
-        {
-            if (value is null)
-            {
-                throw new ArgumentNullException(name);
-            }
-            if (string.IsNullOrWhiteSpace(value))
-            {
-                throw new ArgumentException("Value cannot be empty or contain only white-space characters.", name);
-            }
-        }
-
-        public static void AssertNotDefault<T>(ref T value, string name)
-        where T : struct, IEquatable<T>
-        {
-            if (value.Equals(default))
-            {
-                throw new ArgumentException("Value cannot be empty.", name);
-            }
-        }
-
-        public static void AssertInRange<T>(T value, T minimum, T maximum, string name)
-        where T : notnull, IComparable<T>
-        {
-            if (minimum.CompareTo(value) > 0)
-            {
-                throw new ArgumentOutOfRangeException(name, "Value is less than the minimum allowed.");
-            }
-            if (maximum.CompareTo(value) < 0)
-            {
-                throw new ArgumentOutOfRangeException(name, "Value is greater than the maximum allowed.");
-            }
-        }
-
-        public static void AssertEnumDefined(Type enumType, object value, string name)
-        {
-            if (!Enum.IsDefined(enumType, value))
-            {
-                throw new ArgumentException($"Value not defined for {enumType.FullName}.", name);
-            }
-        }
-
-        public static T CheckNotNull<T>(T value, string name)
-        where T : class
-        {
-            AssertNotNull(value, name);
-            return value;
-        }
-
-        public static string CheckNotNullOrEmpty(string value, string name)
-        {
-            AssertNotNullOrEmpty(value, name);
-            return value;
-        }
-
-        public static void AssertNull<T>(T value, string name, string message = null)
-        {
-            if (value != null)
-            {
-                throw new ArgumentException(message ?? "Value must be null.", name);
-            }
-        }
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Internal/ChangeTrackingDictionary.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Internal/ChangeTrackingDictionary.cs
index 68f055f983b0..e3c864f5551b 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Internal/ChangeTrackingDictionary.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Internal/ChangeTrackingDictionary.cs
@@ -11,7 +11,8 @@
 
 namespace Azure.ResourceManager.SelfHelp
 {
-    internal class ChangeTrackingDictionary<TKey, TValue> : IDictionary<TKey, TValue>, IReadOnlyDictionary<TKey, TValue> where TKey : notnull
+    internal partial class ChangeTrackingDictionary<TKey, TValue> : IDictionary<TKey, TValue>, IReadOnlyDictionary<TKey, TValue>
+        where TKey : notnull
     {
         private IDictionary<TKey, TValue> _innerDictionary;
 
@@ -19,6 +20,7 @@ public ChangeTrackingDictionary()
         {
         }
 
+        /// <param name="dictionary"> The inner dictionary. </param>
         public ChangeTrackingDictionary(IDictionary<TKey, TValue> dictionary)
         {
             if (dictionary == null)
@@ -28,6 +30,7 @@ public ChangeTrackingDictionary(IDictionary<TKey, TValue> dictionary)
             _innerDictionary = new Dictionary<TKey, TValue>(dictionary);
         }
 
+        /// <param name="dictionary"> The inner dictionary. </param>
         public ChangeTrackingDictionary(IReadOnlyDictionary<TKey, TValue> dictionary)
         {
             if (dictionary == null)
@@ -41,16 +44,22 @@ public ChangeTrackingDictionary(IReadOnlyDictionary<TKey, TValue> dictionary)
             }
         }
 
+        /// <summary> Gets the IsUndefined. </summary>
         public bool IsUndefined => _innerDictionary == null;
 
+        /// <summary> Gets the Count. </summary>
         public int Count => IsUndefined ? 0 : EnsureDictionary().Count;
 
+        /// <summary> Gets the IsReadOnly. </summary>
         public bool IsReadOnly => IsUndefined ? false : EnsureDictionary().IsReadOnly;
 
+        /// <summary> Gets the Keys. </summary>
         public ICollection<TKey> Keys => IsUndefined ? Array.Empty<TKey>() : EnsureDictionary().Keys;
 
+        /// <summary> Gets the Values. </summary>
         public ICollection<TValue> Values => IsUndefined ? Array.Empty<TValue>() : EnsureDictionary().Values;
 
+        /// <summary> Gets or sets the value associated with the specified key. </summary>
         public TValue this[TKey key]
         {
             get
@@ -67,8 +76,10 @@ public TValue this[TKey key]
             }
         }
 
+        /// <summary> Gets the Keys. </summary>
         IEnumerable<TKey> IReadOnlyDictionary<TKey, TValue>.Keys => Keys;
 
+        /// <summary> Gets the Values. </summary>
         IEnumerable<TValue> IReadOnlyDictionary<TKey, TValue>.Values => Values;
 
         public IEnumerator<KeyValuePair<TKey, TValue>> GetEnumerator()
@@ -89,6 +100,7 @@ IEnumerator IEnumerable.GetEnumerator()
             return GetEnumerator();
         }
 
+        /// <param name="item"> The item to add. </param>
         public void Add(KeyValuePair<TKey, TValue> item)
         {
             EnsureDictionary().Add(item);
@@ -99,6 +111,7 @@ public void Clear()
             EnsureDictionary().Clear();
         }
 
+        /// <param name="item"> The item to search for. </param>
         public bool Contains(KeyValuePair<TKey, TValue> item)
         {
             if (IsUndefined)
@@ -108,6 +121,8 @@ public bool Contains(KeyValuePair<TKey, TValue> item)
             return EnsureDictionary().Contains(item);
         }
 
+        /// <param name="array"> The array to copy. </param>
+        /// <param name="index"> The index. </param>
         public void CopyTo(KeyValuePair<TKey, TValue>[] array, int index)
         {
             if (IsUndefined)
@@ -117,6 +132,7 @@ public void CopyTo(KeyValuePair<TKey, TValue>[] array, int index)
             EnsureDictionary().CopyTo(array, index);
         }
 
+        /// <param name="item"> The item to remove. </param>
         public bool Remove(KeyValuePair<TKey, TValue> item)
         {
             if (IsUndefined)
@@ -126,11 +142,14 @@ public bool Remove(KeyValuePair<TKey, TValue> item)
             return EnsureDictionary().Remove(item);
         }
 
+        /// <param name="key"> The key. </param>
+        /// <param name="value"> The value to add. </param>
         public void Add(TKey key, TValue value)
         {
             EnsureDictionary().Add(key, value);
         }
 
+        /// <param name="key"> The key to search for. </param>
         public bool ContainsKey(TKey key)
         {
             if (IsUndefined)
@@ -140,6 +159,7 @@ public bool ContainsKey(TKey key)
             return EnsureDictionary().ContainsKey(key);
         }
 
+        /// <param name="key"> The key. </param>
         public bool Remove(TKey key)
         {
             if (IsUndefined)
@@ -149,6 +169,8 @@ public bool Remove(TKey key)
             return EnsureDictionary().Remove(key);
         }
 
+        /// <param name="key"> The key to search for. </param>
+        /// <param name="value"> The value. </param>
         public bool TryGetValue(TKey key, out TValue value)
         {
             if (IsUndefined)
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Internal/ChangeTrackingList.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Internal/ChangeTrackingList.cs
index fdb58a3138cf..17cfc3518a15 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Internal/ChangeTrackingList.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Internal/ChangeTrackingList.cs
@@ -12,7 +12,7 @@
 
 namespace Azure.ResourceManager.SelfHelp
 {
-    internal class ChangeTrackingList<T> : IList<T>, IReadOnlyList<T>
+    internal partial class ChangeTrackingList<T> : IList<T>, IReadOnlyList<T>
     {
         private IList<T> _innerList;
 
@@ -20,6 +20,7 @@ public ChangeTrackingList()
         {
         }
 
+        /// <param name="innerList"> The inner list. </param>
         public ChangeTrackingList(IList<T> innerList)
         {
             if (innerList != null)
@@ -28,6 +29,7 @@ public ChangeTrackingList(IList<T> innerList)
             }
         }
 
+        /// <param name="innerList"> The inner list. </param>
         public ChangeTrackingList(IReadOnlyList<T> innerList)
         {
             if (innerList != null)
@@ -36,12 +38,16 @@ public ChangeTrackingList(IReadOnlyList<T> innerList)
             }
         }
 
+        /// <summary> Gets the IsUndefined. </summary>
         public bool IsUndefined => _innerList == null;
 
+        /// <summary> Gets the Count. </summary>
         public int Count => IsUndefined ? 0 : EnsureList().Count;
 
+        /// <summary> Gets the IsReadOnly. </summary>
         public bool IsReadOnly => IsUndefined ? false : EnsureList().IsReadOnly;
 
+        /// <summary> Gets or sets the value associated with the specified key. </summary>
         public T this[int index]
         {
             get
@@ -85,6 +91,7 @@ IEnumerator IEnumerable.GetEnumerator()
             return GetEnumerator();
         }
 
+        /// <param name="item"> The item to add. </param>
         public void Add(T item)
         {
             EnsureList().Add(item);
@@ -95,6 +102,7 @@ public void Clear()
             EnsureList().Clear();
         }
 
+        /// <param name="item"> The item. </param>
         public bool Contains(T item)
         {
             if (IsUndefined)
@@ -104,6 +112,8 @@ public bool Contains(T item)
             return EnsureList().Contains(item);
         }
 
+        /// <param name="array"> The array to copy to. </param>
+        /// <param name="arrayIndex"> The array index. </param>
         public void CopyTo(T[] array, int arrayIndex)
         {
             if (IsUndefined)
@@ -113,6 +123,7 @@ public void CopyTo(T[] array, int arrayIndex)
             EnsureList().CopyTo(array, arrayIndex);
         }
 
+        /// <param name="item"> The item. </param>
         public bool Remove(T item)
         {
             if (IsUndefined)
@@ -122,6 +133,7 @@ public bool Remove(T item)
             return EnsureList().Remove(item);
         }
 
+        /// <param name="item"> The item. </param>
         public int IndexOf(T item)
         {
             if (IsUndefined)
@@ -131,11 +143,14 @@ public int IndexOf(T item)
             return EnsureList().IndexOf(item);
         }
 
+        /// <param name="index"> The inner list. </param>
+        /// <param name="item"> The item. </param>
         public void Insert(int index, T item)
         {
             EnsureList().Insert(index, item);
         }
 
+        /// <param name="index"> The inner list. </param>
         public void RemoveAt(int index)
         {
             if (IsUndefined)
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Internal/ClientPipelineExtensions.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Internal/ClientPipelineExtensions.cs
new file mode 100644
index 000000000000..cc7c947f4aff
--- /dev/null
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Internal/ClientPipelineExtensions.cs
@@ -0,0 +1,72 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System.Threading;
+using System.Threading.Tasks;
+using Azure;
+using Azure.Core;
+using Azure.Core.Pipeline;
+
+namespace Azure.ResourceManager.SelfHelp
+{
+    internal static partial class ClientPipelineExtensions
+    {
+        public static async ValueTask<Response> ProcessMessageAsync(this HttpPipeline pipeline, HttpMessage message, RequestContext context)
+        {
+            (CancellationToken userCancellationToken, ErrorOptions statusOption) = context.Parse();
+            await pipeline.SendAsync(message, userCancellationToken).ConfigureAwait(false);
+
+            if (message.Response.IsError && (context?.ErrorOptions & ErrorOptions.NoThrow) != ErrorOptions.NoThrow)
+            {
+                throw new RequestFailedException(message.Response);
+            }
+
+            return message.Response;
+        }
+
+        public static Response ProcessMessage(this HttpPipeline pipeline, HttpMessage message, RequestContext context)
+        {
+            (CancellationToken userCancellationToken, ErrorOptions statusOption) = context.Parse();
+            pipeline.Send(message, userCancellationToken);
+
+            if (message.Response.IsError && (context?.ErrorOptions & ErrorOptions.NoThrow) != ErrorOptions.NoThrow)
+            {
+                throw new RequestFailedException(message.Response);
+            }
+
+            return message.Response;
+        }
+
+        public static async ValueTask<Response<bool>> ProcessHeadAsBoolMessageAsync(this HttpPipeline pipeline, HttpMessage message, RequestContext context)
+        {
+            Response response = await pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
+            switch (response.Status)
+            {
+                case >= 200 and < 300:
+                    return Response.FromValue(true, response);
+                case >= 400 and < 500:
+                    return Response.FromValue(false, response);
+                default:
+                    return new ErrorResult<bool>(response, new RequestFailedException(response));
+            }
+        }
+
+        public static Response<bool> ProcessHeadAsBoolMessage(this HttpPipeline pipeline, HttpMessage message, RequestContext context)
+        {
+            Response response = pipeline.ProcessMessage(message, context);
+            switch (response.Status)
+            {
+                case >= 200 and < 300:
+                    return Response.FromValue(true, response);
+                case >= 400 and < 500:
+                    return Response.FromValue(false, response);
+                default:
+                    return new ErrorResult<bool>(response, new RequestFailedException(response));
+            }
+        }
+    }
+}
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Internal/CodeGenMemberAttribute.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Internal/CodeGenMemberAttribute.cs
new file mode 100644
index 000000000000..20b46bee3acd
--- /dev/null
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Internal/CodeGenMemberAttribute.cs
@@ -0,0 +1,20 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+
+namespace Azure.ResourceManager.SelfHelp
+{
+    [AttributeUsage((AttributeTargets.Property | AttributeTargets.Field))]
+    internal partial class CodeGenMemberAttribute : CodeGenTypeAttribute
+    {
+        /// <param name="originalName"> The original name of the member. </param>
+        public CodeGenMemberAttribute(string originalName) : base(originalName)
+        {
+        }
+    }
+}
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Internal/CodeGenSerializationAttribute.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Internal/CodeGenSerializationAttribute.cs
new file mode 100644
index 000000000000..cf197147e17f
--- /dev/null
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Internal/CodeGenSerializationAttribute.cs
@@ -0,0 +1,48 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+
+namespace Azure.ResourceManager.SelfHelp
+{
+    [AttributeUsage((AttributeTargets.Class | AttributeTargets.Struct), AllowMultiple = true, Inherited = true)]
+    internal partial class CodeGenSerializationAttribute : Attribute
+    {
+        /// <param name="propertyName"> The property name which these hooks apply to. </param>
+        public CodeGenSerializationAttribute(string propertyName)
+        {
+            PropertyName = propertyName;
+        }
+
+        /// <param name="propertyName"> The property name which these hooks apply to. </param>
+        /// <param name="serializationName"> The serialization name of the property. </param>
+        public CodeGenSerializationAttribute(string propertyName, string serializationName)
+        {
+            PropertyName = propertyName;
+            SerializationName = serializationName;
+        }
+
+        /// <summary> Gets or sets the property name which these hooks should apply to. </summary>
+        public string PropertyName { get; }
+
+        /// <summary> Gets or sets the serialization name of the property. </summary>
+        public string SerializationName { get; set; }
+
+        /// <summary>
+        /// Gets or sets the method name to use when serializing the property value (property name excluded).
+        /// The signature of the serialization hook method must be or compatible with when invoking: private void SerializeHook(Utf8JsonWriter writer);
+        /// </summary>
+        public string SerializationValueHook { get; set; }
+
+        /// <summary>
+        /// Gets or sets the method name to use when deserializing the property value from the JSON.
+        /// private static void DeserializationHook(JsonProperty property, ref TypeOfTheProperty propertyValue); // if the property is required
+        /// private static void DeserializationHook(JsonProperty property, ref Optional&lt;TypeOfTheProperty&gt; propertyValue); // if the property is optional
+        /// </summary>
+        public string DeserializationValueHook { get; set; }
+    }
+}
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Internal/CodeGenSuppressAttribute.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Internal/CodeGenSuppressAttribute.cs
new file mode 100644
index 000000000000..bbced4baeca7
--- /dev/null
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Internal/CodeGenSuppressAttribute.cs
@@ -0,0 +1,29 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+
+namespace Azure.ResourceManager.SelfHelp
+{
+    [AttributeUsage((AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Struct), AllowMultiple = true)]
+    internal partial class CodeGenSuppressAttribute : Attribute
+    {
+        /// <param name="member"> The member to suppress. </param>
+        /// <param name="parameters"> The types of the parameters of the member. </param>
+        public CodeGenSuppressAttribute(string member, params Type[] parameters)
+        {
+            Member = member;
+            Parameters = parameters;
+        }
+
+        /// <summary> Gets the Member. </summary>
+        public string Member { get; }
+
+        /// <summary> Gets the Parameters. </summary>
+        public Type[] Parameters { get; }
+    }
+}
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Internal/CodeGenTypeAttribute.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Internal/CodeGenTypeAttribute.cs
new file mode 100644
index 000000000000..b420ed9fe1cd
--- /dev/null
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Internal/CodeGenTypeAttribute.cs
@@ -0,0 +1,24 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+
+namespace Azure.ResourceManager.SelfHelp
+{
+    [AttributeUsage((AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Struct))]
+    internal partial class CodeGenTypeAttribute : Attribute
+    {
+        /// <param name="originalName"> The original name of the type. </param>
+        public CodeGenTypeAttribute(string originalName)
+        {
+            OriginalName = originalName;
+        }
+
+        /// <summary> Gets the OriginalName. </summary>
+        public string OriginalName { get; }
+    }
+}
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Internal/ErrorResult.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Internal/ErrorResult.cs
new file mode 100644
index 000000000000..f4e75d04e5cc
--- /dev/null
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Internal/ErrorResult.cs
@@ -0,0 +1,32 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using Azure;
+
+namespace Azure.ResourceManager.SelfHelp
+{
+    internal partial class ErrorResult<T> : Response<T>
+    {
+        private readonly Response _response;
+        private readonly RequestFailedException _exception;
+
+        public ErrorResult(Response response, RequestFailedException exception)
+        {
+            _response = response;
+            _exception = exception;
+        }
+
+        /// <summary> Gets the Value. </summary>
+        public override T Value => throw _exception;
+
+        /// <summary></summary>
+        public override Response GetRawResponse()
+        {
+            return _response;
+        }
+    }
+}
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Internal/ModelSerializationExtensions.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Internal/ModelSerializationExtensions.cs
index f532c527a330..d1503e6d27a3 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Internal/ModelSerializationExtensions.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Internal/ModelSerializationExtensions.cs
@@ -11,18 +11,16 @@
 using System.Diagnostics;
 using System.Globalization;
 using System.Text.Json;
-using System.Xml;
-using Azure.Core;
 
 namespace Azure.ResourceManager.SelfHelp
 {
-    internal static class ModelSerializationExtensions
+    internal static partial class ModelSerializationExtensions
     {
-        internal static readonly JsonDocumentOptions JsonDocumentOptions = new JsonDocumentOptions { MaxDepth = 256 };
         internal static readonly ModelReaderWriterOptions WireOptions = new ModelReaderWriterOptions("W");
-        internal static readonly ModelReaderWriterOptions WireV3Options = new ModelReaderWriterOptions("W|v3");
-        internal static readonly ModelReaderWriterOptions JsonV3Options = new ModelReaderWriterOptions("J|v3");
-        internal static readonly BinaryData SentinelValue = BinaryData.FromBytes("\"__EMPTY__\""u8.ToArray());
+        internal static readonly JsonDocumentOptions JsonDocumentOptions = new JsonDocumentOptions
+        {
+            MaxDepth = 256
+        };
 
         public static object GetObject(this JsonElement element)
         {
@@ -48,14 +46,14 @@ public static object GetObject(this JsonElement element)
                 case JsonValueKind.Null:
                     return null;
                 case JsonValueKind.Object:
-                    var dictionary = new Dictionary<string, object>();
+                    Dictionary<string, object> dictionary = new Dictionary<string, object>();
                     foreach (var jsonProperty in element.EnumerateObject())
                     {
                         dictionary.Add(jsonProperty.Name, jsonProperty.Value.GetObject());
                     }
                     return dictionary;
                 case JsonValueKind.Array:
-                    var list = new List<object>();
+                    List<object> list = new List<object>();
                     foreach (var item in element.EnumerateArray())
                     {
                         list.Add(item.GetObject());
@@ -93,7 +91,7 @@ public static char GetChar(this JsonElement element)
         {
             if (element.ValueKind == JsonValueKind.String)
             {
-                var text = element.GetString();
+                string text = element.GetString();
                 if (text == null || text.Length != 1)
                 {
                     throw new NotSupportedException($"Cannot convert \"{text}\" to a char");
@@ -107,14 +105,14 @@ public static char GetChar(this JsonElement element)
         }
 
         [Conditional("DEBUG")]
-        public static void ThrowNonNullablePropertyIsNull(this JsonProperty property)
+        public static void ThrowNonNullablePropertyIsNull(this JsonProperty @property)
         {
-            throw new JsonException($"A property '{property.Name}' defined as non-nullable but received as null from the service. This exception only happens in DEBUG builds of the library and would be ignored in the release build");
+            throw new JsonException($"A property '{@property.Name}' defined as non-nullable but received as null from the service. This exception only happens in DEBUG builds of the library and would be ignored in the release build");
         }
 
         public static string GetRequiredString(this JsonElement element)
         {
-            var value = element.GetString();
+            string value = element.GetString();
             if (value == null)
             {
                 throw new InvalidOperationException($"The requested operation requires an element of type 'String', but the target element has type '{element.ValueKind}'.");
@@ -181,9 +179,6 @@ public static void WriteObjectValue<T>(this Utf8JsonWriter writer, T value, Mode
                 case IJsonModel<T> jsonModel:
                     jsonModel.Write(writer, options ?? WireOptions);
                     break;
-                case IUtf8JsonSerializable serializable:
-                    serializable.Write(writer);
-                    break;
                 case byte[] bytes:
                     writer.WriteBase64StringValue(bytes);
                     break;
@@ -259,151 +254,5 @@ public static void WriteObjectValue(this Utf8JsonWriter writer, object value, Mo
         {
             writer.WriteObjectValue<object>(value, options);
         }
-
-        internal static bool IsSentinelValue(BinaryData value)
-        {
-            ReadOnlySpan<byte> sentinelSpan = SentinelValue.ToMemory().Span;
-            ReadOnlySpan<byte> valueSpan = value.ToMemory().Span;
-            return sentinelSpan.SequenceEqual(valueSpan);
-        }
-
-        internal static class TypeFormatters
-        {
-            private const string RoundtripZFormat = "yyyy-MM-ddTHH:mm:ss.fffffffZ";
-            public const string DefaultNumberFormat = "G";
-
-            public static string ToString(bool value) => value ? "true" : "false";
-
-            public static string ToString(DateTime value, string format) => value.Kind switch
-            {
-                DateTimeKind.Utc => ToString((DateTimeOffset)value, format),
-                _ => throw new NotSupportedException($"DateTime {value} has a Kind of {value.Kind}. Azure SDK requires it to be UTC. You can call DateTime.SpecifyKind to change Kind property value to DateTimeKind.Utc.")
-            };
-
-            public static string ToString(DateTimeOffset value, string format) => format switch
-            {
-                "D" => value.ToString("yyyy-MM-dd", CultureInfo.InvariantCulture),
-                "U" => value.ToUnixTimeSeconds().ToString(CultureInfo.InvariantCulture),
-                "O" => value.ToUniversalTime().ToString(RoundtripZFormat, CultureInfo.InvariantCulture),
-                "o" => value.ToUniversalTime().ToString(RoundtripZFormat, CultureInfo.InvariantCulture),
-                "R" => value.ToString("r", CultureInfo.InvariantCulture),
-                _ => value.ToString(format, CultureInfo.InvariantCulture)
-            };
-
-            public static string ToString(TimeSpan value, string format) => format switch
-            {
-                "P" => XmlConvert.ToString(value),
-                _ => value.ToString(format, CultureInfo.InvariantCulture)
-            };
-
-            public static string ToString(byte[] value, string format) => format switch
-            {
-                "U" => ToBase64UrlString(value),
-                "D" => Convert.ToBase64String(value),
-                _ => throw new ArgumentException($"Format is not supported: '{format}'", nameof(format))
-            };
-
-            public static string ToBase64UrlString(byte[] value)
-            {
-                int numWholeOrPartialInputBlocks = checked(value.Length + 2) / 3;
-                int size = checked(numWholeOrPartialInputBlocks * 4);
-                char[] output = new char[size];
-
-                int numBase64Chars = Convert.ToBase64CharArray(value, 0, value.Length, output, 0);
-
-                int i = 0;
-                for (; i < numBase64Chars; i++)
-                {
-                    char ch = output[i];
-                    if (ch == '+')
-                    {
-                        output[i] = '-';
-                    }
-                    else
-                    {
-                        if (ch == '/')
-                        {
-                            output[i] = '_';
-                        }
-                        else
-                        {
-                            if (ch == '=')
-                            {
-                                break;
-                            }
-                        }
-                    }
-                }
-
-                return new string(output, 0, i);
-            }
-
-            public static byte[] FromBase64UrlString(string value)
-            {
-                int paddingCharsToAdd = (value.Length % 4) switch
-                {
-                    0 => 0,
-                    2 => 2,
-                    3 => 1,
-                    _ => throw new InvalidOperationException("Malformed input")
-                };
-                char[] output = new char[(value.Length + paddingCharsToAdd)];
-                int i = 0;
-                for (; i < value.Length; i++)
-                {
-                    char ch = value[i];
-                    if (ch == '-')
-                    {
-                        output[i] = '+';
-                    }
-                    else
-                    {
-                        if (ch == '_')
-                        {
-                            output[i] = '/';
-                        }
-                        else
-                        {
-                            output[i] = ch;
-                        }
-                    }
-                }
-
-                for (; i < output.Length; i++)
-                {
-                    output[i] = '=';
-                }
-
-                return Convert.FromBase64CharArray(output, 0, output.Length);
-            }
-
-            public static DateTimeOffset ParseDateTimeOffset(string value, string format) => format switch
-            {
-                "U" => DateTimeOffset.FromUnixTimeSeconds(long.Parse(value, CultureInfo.InvariantCulture)),
-                _ => DateTimeOffset.Parse(value, CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal)
-            };
-
-            public static TimeSpan ParseTimeSpan(string value, string format) => format switch
-            {
-                "P" => XmlConvert.ToTimeSpan(value),
-                _ => TimeSpan.ParseExact(value, format, CultureInfo.InvariantCulture)
-            };
-
-            public static string ConvertToString(object value, string format = null) => value switch
-            {
-                null => "null",
-                string s => s,
-                bool b => ToString(b),
-                int or float or double or long or decimal => ((IFormattable)value).ToString(DefaultNumberFormat, CultureInfo.InvariantCulture),
-                byte[] b0 when format != null => ToString(b0, format),
-                IEnumerable<string> s0 => string.Join(",", s0),
-                DateTimeOffset dateTime when format != null => ToString(dateTime, format),
-                TimeSpan timeSpan when format != null => ToString(timeSpan, format),
-                TimeSpan timeSpan0 => XmlConvert.ToString(timeSpan0),
-                Guid guid => guid.ToString(),
-                BinaryData binaryData => ConvertToString(binaryData.ToArray(), format),
-                _ => value.ToString()
-            };
-        }
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Internal/Optional.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Internal/Optional.cs
index 569dae7715cc..65ab87aa8899 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Internal/Optional.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Internal/Optional.cs
@@ -10,7 +10,7 @@
 
 namespace Azure.ResourceManager.SelfHelp
 {
-    internal static class Optional
+    internal static partial class Optional
     {
         public static bool IsCollectionDefined<T>(IEnumerable<T> collection)
         {
@@ -28,7 +28,7 @@ public static bool IsCollectionDefined<TKey, TValue>(IReadOnlyDictionary<TKey, T
         }
 
         public static bool IsDefined<T>(T? value)
-        where T : struct
+            where T : struct
         {
             return value.HasValue;
         }
@@ -38,14 +38,14 @@ public static bool IsDefined(object value)
             return value != null;
         }
 
-        public static bool IsDefined(JsonElement value)
+        public static bool IsDefined(string value)
         {
-            return value.ValueKind != JsonValueKind.Undefined;
+            return value != null;
         }
 
-        public static bool IsDefined(string value)
+        public static bool IsDefined(JsonElement value)
         {
-            return value != null;
+            return value.ValueKind != JsonValueKind.Undefined;
         }
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Internal/RawRequestUriBuilderExtensions.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Internal/RawRequestUriBuilderExtensions.cs
new file mode 100644
index 000000000000..b95e1d2a4e74
--- /dev/null
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Internal/RawRequestUriBuilderExtensions.cs
@@ -0,0 +1,23 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System.Collections.Generic;
+using System.Linq;
+using Azure.Core;
+
+namespace Azure.ResourceManager.SelfHelp
+{
+    internal static partial class RawRequestUriBuilderExtensions
+    {
+        public static void AppendQueryDelimited<T>(this RawRequestUriBuilder builder, string name, IEnumerable<T> value, string delimiter, SerializationFormat format = SerializationFormat.Default, bool escape = true)
+        {
+            delimiter ??= ",";
+            IEnumerable<string> stringValues = value.Select(v => TypeFormatters.ConvertToString(v, format));
+            builder.AppendQuery(name, string.Join(delimiter, stringValues), escape);
+        }
+    }
+}
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Internal/RequestContextExtensions.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Internal/RequestContextExtensions.cs
new file mode 100644
index 000000000000..f24ea4921dd6
--- /dev/null
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Internal/RequestContextExtensions.cs
@@ -0,0 +1,26 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Threading;
+using Azure;
+
+namespace Azure.ResourceManager.SelfHelp
+{
+    internal static partial class RequestContextExtensions
+    {
+        /// <param name="context"> The request context, which can override default behaviors of the client pipeline on a per-call basis. </param>
+        public static ValueTuple<CancellationToken, ErrorOptions> Parse(this RequestContext context)
+        {
+            if (context == null)
+            {
+                return (CancellationToken.None, ErrorOptions.Default);
+            }
+            return (context.CancellationToken, context.ErrorOptions);
+        }
+    }
+}
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Internal/SerializationFormat.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Internal/SerializationFormat.cs
new file mode 100644
index 000000000000..b1952e655c9a
--- /dev/null
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Internal/SerializationFormat.cs
@@ -0,0 +1,49 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+namespace Azure.ResourceManager.SelfHelp
+{
+    internal enum SerializationFormat
+    {
+        /// <summary> The default serialization format. </summary>
+        Default = 0,
+        /// <summary> The RFC1123 date time format. </summary>
+        DateTime_RFC1123 = 1,
+        /// <summary> The RFC3339 date time format. </summary>
+        DateTime_RFC3339 = 2,
+        /// <summary> The RFC7231 date time format. </summary>
+        DateTime_RFC7231 = 3,
+        /// <summary> The ISO8601 date time format. </summary>
+        DateTime_ISO8601 = 4,
+        /// <summary> The Unix date time format. </summary>
+        DateTime_Unix = 5,
+        /// <summary> The ISO8601 date format. </summary>
+        Date_ISO8601 = 6,
+        /// <summary> The ISO8601 duration format. </summary>
+        Duration_ISO8601 = 7,
+        /// <summary> The constant duration format. </summary>
+        Duration_Constant = 8,
+        /// <summary> The seconds duration format. </summary>
+        Duration_Seconds = 9,
+        /// <summary> The seconds duration format with float precision. </summary>
+        Duration_Seconds_Float = 10,
+        /// <summary> The seconds duration format with double precision. </summary>
+        Duration_Seconds_Double = 11,
+        /// <summary> The milliseconds duration format. </summary>
+        Duration_Milliseconds = 12,
+        /// <summary> The milliseconds duration format with float precision. </summary>
+        Duration_Milliseconds_Float = 13,
+        /// <summary> The milliseconds duration format with double precision. </summary>
+        Duration_Milliseconds_Double = 14,
+        /// <summary> The ISO8601 time format. </summary>
+        Time_ISO8601 = 15,
+        /// <summary> The Base64Url bytes format. </summary>
+        Bytes_Base64Url = 16,
+        /// <summary> The Base64 bytes format. </summary>
+        Bytes_Base64 = 17
+    }
+}
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Internal/TypeFormatters.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Internal/TypeFormatters.cs
new file mode 100644
index 000000000000..b13c9de718b9
--- /dev/null
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Internal/TypeFormatters.cs
@@ -0,0 +1,181 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Xml;
+
+namespace Azure.ResourceManager.SelfHelp
+{
+    internal static partial class TypeFormatters
+    {
+        private const string RoundtripZFormat = "yyyy-MM-ddTHH:mm:ss.fffffffZ";
+        public const string DefaultNumberFormat = "G";
+
+        public static string ToString(bool value) => value ? "true" : "false";
+
+        public static string ToString(DateTime value, string format) => value.Kind switch
+        {
+            DateTimeKind.Utc => ToString((DateTimeOffset)value, format),
+            _ => throw new NotSupportedException($"DateTime {value} has a Kind of {value.Kind}. Generated clients require it to be UTC. You can call DateTime.SpecifyKind to change Kind property value to DateTimeKind.Utc.")
+        };
+
+        public static string ToString(DateTimeOffset value, string format) => format switch
+        {
+            "D" => value.ToString("yyyy-MM-dd", CultureInfo.InvariantCulture),
+            "U" => value.ToUnixTimeSeconds().ToString(CultureInfo.InvariantCulture),
+            "O" => value.ToUniversalTime().ToString(RoundtripZFormat, CultureInfo.InvariantCulture),
+            "o" => value.ToUniversalTime().ToString(RoundtripZFormat, CultureInfo.InvariantCulture),
+            "R" => value.ToString("r", CultureInfo.InvariantCulture),
+            _ => value.ToString(format, CultureInfo.InvariantCulture)
+        };
+
+        public static string ToString(TimeSpan value, string format) => format switch
+        {
+            "P" => XmlConvert.ToString(value),
+            _ => value.ToString(format, CultureInfo.InvariantCulture)
+        };
+
+        public static string ToString(byte[] value, string format) => format switch
+        {
+            "U" => ToBase64UrlString(value),
+            "D" => Convert.ToBase64String(value),
+            _ => throw new ArgumentException($"Format is not supported: '{format}'", nameof(format))
+        };
+
+        public static string ToBase64UrlString(byte[] value)
+        {
+            int numWholeOrPartialInputBlocks = checked (value.Length + 2) / 3;
+            int size = checked (numWholeOrPartialInputBlocks * 4);
+            char[] output = new char[size];
+
+            int numBase64Chars = Convert.ToBase64CharArray(value, 0, value.Length, output, 0);
+
+            int i = 0;
+            for (; i < numBase64Chars; i++)
+            {
+                char ch = output[i];
+                if (ch == '+')
+                {
+                    output[i] = '-';
+                }
+                else
+                {
+                    if (ch == '/')
+                    {
+                        output[i] = '_';
+                    }
+                    else
+                    {
+                        if (ch == '=')
+                        {
+                            break;
+                        }
+                    }
+                }
+            }
+
+            return new string(output, 0, i);
+        }
+
+        public static byte[] FromBase64UrlString(string value)
+        {
+            int paddingCharsToAdd = (value.Length % 4) switch
+            {
+                0 => 0,
+                2 => 2,
+                3 => 1,
+                _ => throw new InvalidOperationException("Malformed input")
+            };
+            char[] output = new char[(value.Length + paddingCharsToAdd)];
+            int i = 0;
+            for (; i < value.Length; i++)
+            {
+                char ch = value[i];
+                if (ch == '-')
+                {
+                    output[i] = '+';
+                }
+                else
+                {
+                    if (ch == '_')
+                    {
+                        output[i] = '/';
+                    }
+                    else
+                    {
+                        output[i] = ch;
+                    }
+                }
+            }
+
+            for (; i < output.Length; i++)
+            {
+                output[i] = '=';
+            }
+
+            return Convert.FromBase64CharArray(output, 0, output.Length);
+        }
+
+        public static DateTimeOffset ParseDateTimeOffset(string value, string format) => format switch
+        {
+            "U" => DateTimeOffset.FromUnixTimeSeconds(long.Parse(value, CultureInfo.InvariantCulture)),
+            _ => DateTimeOffset.Parse(value, CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal)
+        };
+
+        public static TimeSpan ParseTimeSpan(string value, string format) => format switch
+        {
+            "P" => XmlConvert.ToTimeSpan(value),
+            _ => TimeSpan.ParseExact(value, format, CultureInfo.InvariantCulture)
+        };
+
+        public static string ToFormatSpecifier(SerializationFormat format) => format switch
+        {
+            SerializationFormat.DateTime_RFC1123 => "R",
+            SerializationFormat.DateTime_RFC3339 => "O",
+            SerializationFormat.DateTime_RFC7231 => "R",
+            SerializationFormat.DateTime_ISO8601 => "O",
+            SerializationFormat.Date_ISO8601 => "D",
+            SerializationFormat.DateTime_Unix => "U",
+            SerializationFormat.Bytes_Base64Url => "U",
+            SerializationFormat.Bytes_Base64 => "D",
+            SerializationFormat.Duration_ISO8601 => "P",
+            SerializationFormat.Duration_Constant => "c",
+            SerializationFormat.Duration_Seconds => "%s",
+            SerializationFormat.Duration_Seconds_Float => "s\\.FFF",
+            SerializationFormat.Duration_Seconds_Double => "s\\.FFFFFF",
+            SerializationFormat.Time_ISO8601 => "T",
+            _ => null
+        };
+
+        public static string ConvertToString(object value, SerializationFormat format = SerializationFormat.Default)
+        {
+            string formatSpecifier = ToFormatSpecifier(format);
+
+            return value switch
+            {
+                null => "null",
+                string s => s,
+                bool b => ToString(b),
+                int  or  float  or  double  or  long  or  decimal => ((IFormattable)value).ToString(DefaultNumberFormat, CultureInfo.InvariantCulture),
+                byte[] b0 when formatSpecifier != null => ToString(b0, formatSpecifier),
+                IEnumerable<string> s0 => string.Join(",", s0),
+                DateTimeOffset dateTime when formatSpecifier != null => ToString(dateTime, formatSpecifier),
+                TimeSpan timeSpan when format == SerializationFormat.Duration_Seconds => Convert.ToInt32(timeSpan.TotalSeconds).ToString(CultureInfo.InvariantCulture),
+                TimeSpan timeSpan0 when format == SerializationFormat.Duration_Seconds_Float || format == SerializationFormat.Duration_Seconds_Double => timeSpan0.TotalSeconds.ToString(CultureInfo.InvariantCulture),
+                TimeSpan timeSpan1 when format == SerializationFormat.Duration_Milliseconds => Convert.ToInt32(timeSpan1.TotalMilliseconds).ToString(CultureInfo.InvariantCulture),
+                TimeSpan timeSpan2 when format == SerializationFormat.Duration_Milliseconds_Float || format == SerializationFormat.Duration_Milliseconds_Double => timeSpan2.TotalMilliseconds.ToString(CultureInfo.InvariantCulture),
+                TimeSpan timeSpan3 when formatSpecifier != null => ToString(timeSpan3, formatSpecifier),
+                TimeSpan timeSpan4 => XmlConvert.ToString(timeSpan4),
+                Guid guid => guid.ToString(),
+                BinaryData binaryData => ConvertToString(binaryData.ToArray(), format),
+                _ => value.ToString()
+            };
+        }
+    }
+}
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Internal/Utf8JsonRequestContent.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Internal/Utf8JsonRequestContent.cs
index ff90ecbf5846..c383711572a6 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Internal/Utf8JsonRequestContent.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Internal/Utf8JsonRequestContent.cs
@@ -13,7 +13,7 @@
 
 namespace Azure.ResourceManager.SelfHelp
 {
-    internal class Utf8JsonRequestContent : RequestContent
+    internal partial class Utf8JsonRequestContent : RequestContent
     {
         private readonly MemoryStream _stream;
         private readonly RequestContent _content;
@@ -25,20 +25,26 @@ public Utf8JsonRequestContent()
             JsonWriter = new Utf8JsonWriter(_stream);
         }
 
+        /// <summary> Gets the JsonWriter. </summary>
         public Utf8JsonWriter JsonWriter { get; }
 
+        /// <param name="stream"> The stream containing the data to be written. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
         public override async Task WriteToAsync(Stream stream, CancellationToken cancellationToken = default)
         {
             await JsonWriter.FlushAsync().ConfigureAwait(false);
             await _content.WriteToAsync(stream, cancellationToken).ConfigureAwait(false);
         }
 
+        /// <param name="stream"> The stream containing the data to be written. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
         public override void WriteTo(Stream stream, CancellationToken cancellationToken = default)
         {
             JsonWriter.Flush();
             _content.WriteTo(stream, cancellationToken);
         }
 
+        /// <param name="length"></param>
         public override bool TryComputeLength(out long length)
         {
             length = JsonWriter.BytesCommitted + JsonWriter.BytesPending;
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/LongRunningOperation/SelfHelpArmOperationOfT.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/LongRunningOperation/SelfHelpArmOperationOfT.cs
index d2de4b77df06..b7e3ec875f45 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/LongRunningOperation/SelfHelpArmOperationOfT.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/LongRunningOperation/SelfHelpArmOperationOfT.cs
@@ -6,18 +6,16 @@
 #nullable disable
 
 using System;
-using System.ClientModel.Primitives;
-using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
+using Azure;
 using Azure.Core;
 using Azure.Core.Pipeline;
+using Azure.ResourceManager;
 
 namespace Azure.ResourceManager.SelfHelp
 {
-#pragma warning disable SA1649 // File name should match first type name
-    internal class SelfHelpArmOperation<T> : ArmOperation<T>
-#pragma warning restore SA1649 // File name should match first type name
+    internal partial class SelfHelpArmOperation<T> : ArmOperation<T>
     {
         private readonly OperationInternal<T> _operation;
         private readonly RehydrationToken? _completeRehydrationToken;
@@ -29,6 +27,9 @@ protected SelfHelpArmOperation()
         {
         }
 
+        /// <summary></summary>
+        /// <param name="response"> The operation response. </param>
+        /// <param name="rehydrationToken"> The token to rehydrate the operation. </param>
         internal SelfHelpArmOperation(Response<T> response, RehydrationToken? rehydrationToken = null)
         {
             _operation = OperationInternal<T>.Succeeded(response.GetRawResponse(), response.Value);
@@ -36,12 +37,21 @@ internal SelfHelpArmOperation(Response<T> response, RehydrationToken? rehydratio
             _operationId = GetOperationId(rehydrationToken);
         }
 
+        /// <summary></summary>
+        /// <param name="source"> The instance of <see cref="IOperationSource{T}"/>. </param>
+        /// <param name="clientDiagnostics"> The instance of <see cref="ClientDiagnostics"/>. </param>
+        /// <param name="pipeline"> The instance of <see cref="HttpPipeline"/>. </param>
+        /// <param name="request"> The operation request. </param>
+        /// <param name="response"> The operation response. </param>
+        /// <param name="finalStateVia"> The finalStateVia of the operation. </param>
+        /// <param name="skipApiVersionOverride"> If should skip Api version override. </param>
+        /// <param name="apiVersionOverrideValue"> The Api version override value. </param>
         internal SelfHelpArmOperation(IOperationSource<T> source, ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, Request request, Response response, OperationFinalStateVia finalStateVia, bool skipApiVersionOverride = false, string apiVersionOverrideValue = null)
         {
-            var nextLinkOperation = NextLinkOperationImplementation.Create(pipeline, request.Method, request.Uri.ToUri(), response, finalStateVia, skipApiVersionOverride, apiVersionOverrideValue);
-            if (nextLinkOperation is NextLinkOperationImplementation nextLinkOperationValue)
+            IOperation nextLinkOperation = NextLinkOperationImplementation.Create(pipeline, request.Method, request.Uri.ToUri(), response, finalStateVia, skipApiVersionOverride, apiVersionOverrideValue);
+            if (nextLinkOperation is NextLinkOperationImplementation nextLinkOperationImplementation)
             {
-                _nextLinkOperation = nextLinkOperationValue;
+                _nextLinkOperation = nextLinkOperationImplementation;
                 _operationId = _nextLinkOperation.OperationId;
             }
             else
@@ -49,54 +59,55 @@ internal SelfHelpArmOperation(IOperationSource<T> source, ClientDiagnostics clie
                 _completeRehydrationToken = NextLinkOperationImplementation.GetRehydrationToken(request.Method, request.Uri.ToUri(), response, finalStateVia);
                 _operationId = GetOperationId(_completeRehydrationToken);
             }
-            _operation = new OperationInternal<T>(NextLinkOperationImplementation.Create(source, nextLinkOperation), clientDiagnostics, response, "SelfHelpArmOperation", fallbackStrategy: new SequentialDelayStrategy());
+            _operation = new OperationInternal<T>(
+                NextLinkOperationImplementation.Create(source, nextLinkOperation),
+                clientDiagnostics,
+                response,
+                "SelfHelpArmOperation",
+                null,
+                new SequentialDelayStrategy());
         }
 
-        private string GetOperationId(RehydrationToken? rehydrationToken)
-        {
-            if (rehydrationToken is null)
-            {
-                return null;
-            }
-            var data = ModelReaderWriter.Write(rehydrationToken, ModelReaderWriterOptions.Json, AzureResourceManagerSelfHelpContext.Default);
-            using var document = JsonDocument.Parse(data);
-            var lroDetails = document.RootElement;
-            return lroDetails.GetProperty("id").GetString();
-        }
-        /// <inheritdoc />
+        /// <summary> Gets the Id. </summary>
         public override string Id => _operationId ?? NextLinkOperationImplementation.NotSet;
 
-        /// <inheritdoc />
-        public override RehydrationToken? GetRehydrationToken() => _nextLinkOperation?.GetRehydrationToken() ?? _completeRehydrationToken;
-
-        /// <inheritdoc />
+        /// <summary> Gets the Value. </summary>
         public override T Value => _operation.Value;
 
-        /// <inheritdoc />
+        /// <summary> Gets the HasValue. </summary>
         public override bool HasValue => _operation.HasValue;
 
-        /// <inheritdoc />
+        /// <summary> Gets the HasCompleted. </summary>
         public override bool HasCompleted => _operation.HasCompleted;
 
-        /// <inheritdoc />
+        /// <param name="rehydrationToken"> The token to rehydrate a long-running operation. </param>
+        private string GetOperationId(RehydrationToken? rehydrationToken)
+        {
+            return rehydrationToken?.Id;
+        }
+
+        /// <inheritdoc/>
+        public override RehydrationToken? GetRehydrationToken() => _nextLinkOperation?.GetRehydrationToken() ?? _completeRehydrationToken;
+
+        /// <inheritdoc/>
         public override Response GetRawResponse() => _operation.RawResponse;
 
-        /// <inheritdoc />
+        /// <inheritdoc/>
         public override Response UpdateStatus(CancellationToken cancellationToken = default) => _operation.UpdateStatus(cancellationToken);
 
-        /// <inheritdoc />
+        /// <inheritdoc/>
         public override ValueTask<Response> UpdateStatusAsync(CancellationToken cancellationToken = default) => _operation.UpdateStatusAsync(cancellationToken);
 
-        /// <inheritdoc />
+        /// <inheritdoc/>
         public override Response<T> WaitForCompletion(CancellationToken cancellationToken = default) => _operation.WaitForCompletion(cancellationToken);
 
-        /// <inheritdoc />
+        /// <inheritdoc/>
         public override Response<T> WaitForCompletion(TimeSpan pollingInterval, CancellationToken cancellationToken = default) => _operation.WaitForCompletion(pollingInterval, cancellationToken);
 
-        /// <inheritdoc />
+        /// <inheritdoc/>
         public override ValueTask<Response<T>> WaitForCompletionAsync(CancellationToken cancellationToken = default) => _operation.WaitForCompletionAsync(cancellationToken);
 
-        /// <inheritdoc />
+        /// <inheritdoc/>
         public override ValueTask<Response<T>> WaitForCompletionAsync(TimeSpan pollingInterval, CancellationToken cancellationToken = default) => _operation.WaitForCompletionAsync(pollingInterval, cancellationToken);
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/LongRunningOperation/SelfHelpDiagnosticOperationSource.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/LongRunningOperation/SelfHelpDiagnosticOperationSource.cs
index c68e643fefbe..1cdf88dd4da1 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/LongRunningOperation/SelfHelpDiagnosticOperationSource.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/LongRunningOperation/SelfHelpDiagnosticOperationSource.cs
@@ -5,32 +5,45 @@
 
 #nullable disable
 
-using System.ClientModel.Primitives;
+using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
+using Azure;
 using Azure.Core;
+using Azure.ResourceManager;
 
 namespace Azure.ResourceManager.SelfHelp
 {
-    internal class SelfHelpDiagnosticOperationSource : IOperationSource<SelfHelpDiagnosticResource>
+    /// <summary></summary>
+    internal partial class SelfHelpDiagnosticOperationSource : IOperationSource<SelfHelpDiagnosticResource>
     {
         private readonly ArmClient _client;
 
+        /// <summary></summary>
+        /// <param name="client"></param>
         internal SelfHelpDiagnosticOperationSource(ArmClient client)
         {
             _client = client;
         }
 
+        /// <param name="response"> The response from the service. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <returns></returns>
         SelfHelpDiagnosticResource IOperationSource<SelfHelpDiagnosticResource>.CreateResult(Response response, CancellationToken cancellationToken)
         {
-            var data = ModelReaderWriter.Read<SelfHelpDiagnosticData>(response.Content, ModelReaderWriterOptions.Json, AzureResourceManagerSelfHelpContext.Default);
+            using JsonDocument document = JsonDocument.Parse(response.ContentStream);
+            SelfHelpDiagnosticData data = SelfHelpDiagnosticData.DeserializeSelfHelpDiagnosticData(document.RootElement, ModelSerializationExtensions.WireOptions);
             return new SelfHelpDiagnosticResource(_client, data);
         }
 
+        /// <param name="response"> The response from the service. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <returns></returns>
         async ValueTask<SelfHelpDiagnosticResource> IOperationSource<SelfHelpDiagnosticResource>.CreateResultAsync(Response response, CancellationToken cancellationToken)
         {
-            var data = ModelReaderWriter.Read<SelfHelpDiagnosticData>(response.Content, ModelReaderWriterOptions.Json, AzureResourceManagerSelfHelpContext.Default);
-            return await Task.FromResult(new SelfHelpDiagnosticResource(_client, data)).ConfigureAwait(false);
+            using JsonDocument document = await JsonDocument.ParseAsync(response.ContentStream, default, cancellationToken).ConfigureAwait(false);
+            SelfHelpDiagnosticData data = SelfHelpDiagnosticData.DeserializeSelfHelpDiagnosticData(document.RootElement, ModelSerializationExtensions.WireOptions);
+            return new SelfHelpDiagnosticResource(_client, data);
         }
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/LongRunningOperation/SelfHelpSimplifiedSolutionOperationSource.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/LongRunningOperation/SelfHelpSimplifiedSolutionOperationSource.cs
deleted file mode 100644
index a63c9c914966..000000000000
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/LongRunningOperation/SelfHelpSimplifiedSolutionOperationSource.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System.ClientModel.Primitives;
-using System.Threading;
-using System.Threading.Tasks;
-using Azure.Core;
-
-namespace Azure.ResourceManager.SelfHelp
-{
-    internal class SelfHelpSimplifiedSolutionOperationSource : IOperationSource<SelfHelpSimplifiedSolutionResource>
-    {
-        private readonly ArmClient _client;
-
-        internal SelfHelpSimplifiedSolutionOperationSource(ArmClient client)
-        {
-            _client = client;
-        }
-
-        SelfHelpSimplifiedSolutionResource IOperationSource<SelfHelpSimplifiedSolutionResource>.CreateResult(Response response, CancellationToken cancellationToken)
-        {
-            var data = ModelReaderWriter.Read<SelfHelpSimplifiedSolutionData>(response.Content, ModelReaderWriterOptions.Json, AzureResourceManagerSelfHelpContext.Default);
-            return new SelfHelpSimplifiedSolutionResource(_client, data);
-        }
-
-        async ValueTask<SelfHelpSimplifiedSolutionResource> IOperationSource<SelfHelpSimplifiedSolutionResource>.CreateResultAsync(Response response, CancellationToken cancellationToken)
-        {
-            var data = ModelReaderWriter.Read<SelfHelpSimplifiedSolutionData>(response.Content, ModelReaderWriterOptions.Json, AzureResourceManagerSelfHelpContext.Default);
-            return await Task.FromResult(new SelfHelpSimplifiedSolutionResource(_client, data)).ConfigureAwait(false);
-        }
-    }
-}
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/LongRunningOperation/SelfHelpSimplifiedSolutionsOperationSource.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/LongRunningOperation/SelfHelpSimplifiedSolutionsOperationSource.cs
new file mode 100644
index 000000000000..c29699623229
--- /dev/null
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/LongRunningOperation/SelfHelpSimplifiedSolutionsOperationSource.cs
@@ -0,0 +1,49 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System.Text.Json;
+using System.Threading;
+using System.Threading.Tasks;
+using Azure;
+using Azure.Core;
+using Azure.ResourceManager;
+
+namespace Azure.ResourceManager.SelfHelp
+{
+    /// <summary></summary>
+    internal partial class SelfHelpSimplifiedSolutionsOperationSource : IOperationSource<SelfHelpSimplifiedSolutionsResource>
+    {
+        private readonly ArmClient _client;
+
+        /// <summary></summary>
+        /// <param name="client"></param>
+        internal SelfHelpSimplifiedSolutionsOperationSource(ArmClient client)
+        {
+            _client = client;
+        }
+
+        /// <param name="response"> The response from the service. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <returns></returns>
+        SelfHelpSimplifiedSolutionsResource IOperationSource<SelfHelpSimplifiedSolutionsResource>.CreateResult(Response response, CancellationToken cancellationToken)
+        {
+            using JsonDocument document = JsonDocument.Parse(response.ContentStream);
+            SelfHelpSimplifiedSolutionsData data = SelfHelpSimplifiedSolutionsData.DeserializeSelfHelpSimplifiedSolutionsData(document.RootElement, ModelSerializationExtensions.WireOptions);
+            return new SelfHelpSimplifiedSolutionsResource(_client, data);
+        }
+
+        /// <param name="response"> The response from the service. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <returns></returns>
+        async ValueTask<SelfHelpSimplifiedSolutionsResource> IOperationSource<SelfHelpSimplifiedSolutionsResource>.CreateResultAsync(Response response, CancellationToken cancellationToken)
+        {
+            using JsonDocument document = await JsonDocument.ParseAsync(response.ContentStream, default, cancellationToken).ConfigureAwait(false);
+            SelfHelpSimplifiedSolutionsData data = SelfHelpSimplifiedSolutionsData.DeserializeSelfHelpSimplifiedSolutionsData(document.RootElement, ModelSerializationExtensions.WireOptions);
+            return new SelfHelpSimplifiedSolutionsResource(_client, data);
+        }
+    }
+}
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/LongRunningOperation/SelfHelpSolutionOperationSource.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/LongRunningOperation/SelfHelpSolutionOperationSource.cs
index b951da6dc100..d7c9fd0a3242 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/LongRunningOperation/SelfHelpSolutionOperationSource.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/LongRunningOperation/SelfHelpSolutionOperationSource.cs
@@ -5,32 +5,45 @@
 
 #nullable disable
 
-using System.ClientModel.Primitives;
+using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
+using Azure;
 using Azure.Core;
+using Azure.ResourceManager;
 
 namespace Azure.ResourceManager.SelfHelp
 {
-    internal class SelfHelpSolutionOperationSource : IOperationSource<SelfHelpSolutionResource>
+    /// <summary></summary>
+    internal partial class SelfHelpSolutionOperationSource : IOperationSource<SelfHelpSolutionResource>
     {
         private readonly ArmClient _client;
 
+        /// <summary></summary>
+        /// <param name="client"></param>
         internal SelfHelpSolutionOperationSource(ArmClient client)
         {
             _client = client;
         }
 
+        /// <param name="response"> The response from the service. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <returns></returns>
         SelfHelpSolutionResource IOperationSource<SelfHelpSolutionResource>.CreateResult(Response response, CancellationToken cancellationToken)
         {
-            var data = ModelReaderWriter.Read<SelfHelpSolutionData>(response.Content, ModelReaderWriterOptions.Json, AzureResourceManagerSelfHelpContext.Default);
+            using JsonDocument document = JsonDocument.Parse(response.ContentStream);
+            SelfHelpSolutionData data = SelfHelpSolutionData.DeserializeSelfHelpSolutionData(document.RootElement, ModelSerializationExtensions.WireOptions);
             return new SelfHelpSolutionResource(_client, data);
         }
 
+        /// <param name="response"> The response from the service. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <returns></returns>
         async ValueTask<SelfHelpSolutionResource> IOperationSource<SelfHelpSolutionResource>.CreateResultAsync(Response response, CancellationToken cancellationToken)
         {
-            var data = ModelReaderWriter.Read<SelfHelpSolutionData>(response.Content, ModelReaderWriterOptions.Json, AzureResourceManagerSelfHelpContext.Default);
-            return await Task.FromResult(new SelfHelpSolutionResource(_client, data)).ConfigureAwait(false);
+            using JsonDocument document = await JsonDocument.ParseAsync(response.ContentStream, default, cancellationToken).ConfigureAwait(false);
+            SelfHelpSolutionData data = SelfHelpSolutionData.DeserializeSelfHelpSolutionData(document.RootElement, ModelSerializationExtensions.WireOptions);
+            return new SelfHelpSolutionResource(_client, data);
         }
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/AutomatedCheckResult.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/AutomatedCheckResult.Serialization.cs
index 26d647b33b4f..082f3fe9d776 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/AutomatedCheckResult.Serialization.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/AutomatedCheckResult.Serialization.cs
@@ -9,14 +9,15 @@
 using System.ClientModel.Primitives;
 using System.Collections.Generic;
 using System.Text.Json;
-using Azure.Core;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
-    public partial class AutomatedCheckResult : IUtf8JsonSerializable, IJsonModel<AutomatedCheckResult>
+    /// <summary> Only for AutomatedStep type. </summary>
+    public partial class AutomatedCheckResult : IJsonModel<AutomatedCheckResult>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<AutomatedCheckResult>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
+        /// <param name="writer"> The JSON writer. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
         void IJsonModel<AutomatedCheckResult>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
@@ -28,12 +29,11 @@ void IJsonModel<AutomatedCheckResult>.Write(Utf8JsonWriter writer, ModelReaderWr
         /// <param name="options"> The client options for reading and writing models. </param>
         protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<AutomatedCheckResult>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<AutomatedCheckResult>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(AutomatedCheckResult)} does not support writing '{format}' format.");
             }
-
             if (Optional.IsDefined(Version))
             {
                 writer.WritePropertyName("version"u8);
@@ -54,15 +54,15 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
                 writer.WritePropertyName("type"u8);
                 writer.WriteStringValue(ResultType.Value.ToString());
             }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            if (options.Format != "W" && _additionalBinaryDataProperties != null)
             {
-                foreach (var item in _serializedAdditionalRawData)
+                foreach (var item in _additionalBinaryDataProperties)
                 {
                     writer.WritePropertyName(item.Key);
 #if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
+                    writer.WriteRawValue(item.Value);
 #else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value, ModelSerializationExtensions.JsonDocumentOptions))
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
                     {
                         JsonSerializer.Serialize(writer, document.RootElement);
                     }
@@ -71,22 +71,27 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             }
         }
 
-        AutomatedCheckResult IJsonModel<AutomatedCheckResult>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        AutomatedCheckResult IJsonModel<AutomatedCheckResult>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options);
+
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual AutomatedCheckResult JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<AutomatedCheckResult>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<AutomatedCheckResult>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(AutomatedCheckResult)} does not support reading '{format}' format.");
             }
-
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
             return DeserializeAutomatedCheckResult(document.RootElement, options);
         }
 
-        internal static AutomatedCheckResult DeserializeAutomatedCheckResult(JsonElement element, ModelReaderWriterOptions options = null)
+        /// <param name="element"> The JSON element to deserialize. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        internal static AutomatedCheckResult DeserializeAutomatedCheckResult(JsonElement element, ModelReaderWriterOptions options)
         {
-            options ??= ModelSerializationExtensions.WireOptions;
-
             if (element.ValueKind == JsonValueKind.Null)
             {
                 return null;
@@ -94,48 +99,49 @@ internal static AutomatedCheckResult DeserializeAutomatedCheckResult(JsonElement
             string version = default;
             string status = default;
             string result = default;
-            AutomatedCheckResultType? type = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
+            AutomatedCheckResultType? resultType = default;
+            IDictionary<string, BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            foreach (var prop in element.EnumerateObject())
             {
-                if (property.NameEquals("version"u8))
+                if (prop.NameEquals("version"u8))
                 {
-                    version = property.Value.GetString();
+                    version = prop.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("status"u8))
+                if (prop.NameEquals("status"u8))
                 {
-                    status = property.Value.GetString();
+                    status = prop.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("result"u8))
+                if (prop.NameEquals("result"u8))
                 {
-                    result = property.Value.GetString();
+                    result = prop.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("type"u8))
+                if (prop.NameEquals("type"u8))
                 {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
-                    type = new AutomatedCheckResultType(property.Value.GetString());
+                    resultType = new AutomatedCheckResultType(prop.Value.GetString());
                     continue;
                 }
                 if (options.Format != "W")
                 {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                    additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText()));
                 }
             }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new AutomatedCheckResult(version, status, result, type, serializedAdditionalRawData);
+            return new AutomatedCheckResult(version, status, result, resultType, additionalBinaryDataProperties);
         }
 
-        BinaryData IPersistableModel<AutomatedCheckResult>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AutomatedCheckResult>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="options"> The client options for reading and writing models. </param>
+        BinaryData IPersistableModel<AutomatedCheckResult>.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
 
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<AutomatedCheckResult>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
@@ -145,15 +151,20 @@ BinaryData IPersistableModel<AutomatedCheckResult>.Write(ModelReaderWriterOption
             }
         }
 
-        AutomatedCheckResult IPersistableModel<AutomatedCheckResult>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<AutomatedCheckResult>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        AutomatedCheckResult IPersistableModel<AutomatedCheckResult>.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options);
 
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual AutomatedCheckResult PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<AutomatedCheckResult>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
+                    using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
                     {
-                        using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
                         return DeserializeAutomatedCheckResult(document.RootElement, options);
                     }
                 default:
@@ -161,6 +172,7 @@ AutomatedCheckResult IPersistableModel<AutomatedCheckResult>.Create(BinaryData d
             }
         }
 
+        /// <param name="options"> The client options for reading and writing models. </param>
         string IPersistableModel<AutomatedCheckResult>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/AutomatedCheckResult.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/AutomatedCheckResult.cs
index 1f0bfa7adc48..dd4ab9b6644e 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/AutomatedCheckResult.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/AutomatedCheckResult.cs
@@ -13,37 +13,8 @@ namespace Azure.ResourceManager.SelfHelp.Models
     /// <summary> Only for AutomatedStep type. </summary>
     public partial class AutomatedCheckResult
     {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+        /// <summary> Keeps track of any properties unknown to the library. </summary>
+        private protected readonly IDictionary<string, BinaryData> _additionalBinaryDataProperties;
 
         /// <summary> Initializes a new instance of <see cref="AutomatedCheckResult"/>. </summary>
         internal AutomatedCheckResult()
@@ -55,22 +26,25 @@ internal AutomatedCheckResult()
         /// <param name="status"> Status for automated check result. </param>
         /// <param name="result"> Insight Article Content. </param>
         /// <param name="resultType"> Type of Result. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal AutomatedCheckResult(string version, string status, string result, AutomatedCheckResultType? resultType, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        /// <param name="additionalBinaryDataProperties"> Keeps track of any properties unknown to the library. </param>
+        internal AutomatedCheckResult(string version, string status, string result, AutomatedCheckResultType? resultType, IDictionary<string, BinaryData> additionalBinaryDataProperties)
         {
             Version = version;
             Status = status;
             Result = result;
             ResultType = resultType;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
+            _additionalBinaryDataProperties = additionalBinaryDataProperties;
         }
 
         /// <summary> Version for automated check result. </summary>
         public string Version { get; }
+
         /// <summary> Status for automated check result. </summary>
         public string Status { get; }
+
         /// <summary> Insight Article Content. </summary>
         public string Result { get; }
+
         /// <summary> Type of Result. </summary>
         public AutomatedCheckResultType? ResultType { get; }
     }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/AutomatedCheckResultType.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/AutomatedCheckResultType.cs
index 47f4e894a8a5..c3937f48223d 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/AutomatedCheckResultType.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/AutomatedCheckResultType.cs
@@ -7,6 +7,7 @@
 
 using System;
 using System.ComponentModel;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
@@ -14,44 +15,63 @@ namespace Azure.ResourceManager.SelfHelp.Models
     public readonly partial struct AutomatedCheckResultType : IEquatable<AutomatedCheckResultType>
     {
         private readonly string _value;
+        private const string SuccessValue = "Success";
+        private const string WarningValue = "Warning";
+        private const string ErrorValue = "Error";
+        private const string InformationValue = "Information";
 
         /// <summary> Initializes a new instance of <see cref="AutomatedCheckResultType"/>. </summary>
+        /// <param name="value"> The value. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
         public AutomatedCheckResultType(string value)
         {
-            _value = value ?? throw new ArgumentNullException(nameof(value));
-        }
+            Argument.AssertNotNull(value, nameof(value));
 
-        private const string SuccessValue = "Success";
-        private const string WarningValue = "Warning";
-        private const string ErrorValue = "Error";
-        private const string InformationValue = "Information";
+            _value = value;
+        }
 
-        /// <summary> Success. </summary>
+        /// <summary> Gets the Success. </summary>
         public static AutomatedCheckResultType Success { get; } = new AutomatedCheckResultType(SuccessValue);
-        /// <summary> Warning. </summary>
+
+        /// <summary> Gets the Warning. </summary>
         public static AutomatedCheckResultType Warning { get; } = new AutomatedCheckResultType(WarningValue);
-        /// <summary> Error. </summary>
+
+        /// <summary> Gets the Error. </summary>
         public static AutomatedCheckResultType Error { get; } = new AutomatedCheckResultType(ErrorValue);
-        /// <summary> Information. </summary>
+
+        /// <summary> Gets the Information. </summary>
         public static AutomatedCheckResultType Information { get; } = new AutomatedCheckResultType(InformationValue);
+
         /// <summary> Determines if two <see cref="AutomatedCheckResultType"/> values are the same. </summary>
+        /// <param name="left"> The left value to compare. </param>
+        /// <param name="right"> The right value to compare. </param>
         public static bool operator ==(AutomatedCheckResultType left, AutomatedCheckResultType right) => left.Equals(right);
+
         /// <summary> Determines if two <see cref="AutomatedCheckResultType"/> values are not the same. </summary>
+        /// <param name="left"> The left value to compare. </param>
+        /// <param name="right"> The right value to compare. </param>
         public static bool operator !=(AutomatedCheckResultType left, AutomatedCheckResultType right) => !left.Equals(right);
-        /// <summary> Converts a <see cref="string"/> to a <see cref="AutomatedCheckResultType"/>. </summary>
+
+        /// <summary> Converts a string to a <see cref="AutomatedCheckResultType"/>. </summary>
+        /// <param name="value"> The value. </param>
         public static implicit operator AutomatedCheckResultType(string value) => new AutomatedCheckResultType(value);
 
-        /// <inheritdoc />
+        /// <summary> Converts a string to a <see cref="AutomatedCheckResultType"/>. </summary>
+        /// <param name="value"> The value. </param>
+        public static implicit operator AutomatedCheckResultType?(string value) => value == null ? null : new AutomatedCheckResultType(value);
+
+        /// <inheritdoc/>
         [EditorBrowsable(EditorBrowsableState.Never)]
         public override bool Equals(object obj) => obj is AutomatedCheckResultType other && Equals(other);
-        /// <inheritdoc />
+
+        /// <inheritdoc/>
         public bool Equals(AutomatedCheckResultType other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
 
-        /// <inheritdoc />
+        /// <inheritdoc/>
         [EditorBrowsable(EditorBrowsableState.Never)]
         public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
-        /// <inheritdoc />
+
+        /// <inheritdoc/>
         public override string ToString() => _value;
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/AzureResourceManagerSelfHelpContext.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/AzureResourceManagerSelfHelpContext.cs
index e6f89c255d48..2a862b43b2fa 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/AzureResourceManagerSelfHelpContext.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/AzureResourceManagerSelfHelpContext.cs
@@ -6,6 +6,7 @@
 #nullable disable
 
 using System.ClientModel.Primitives;
+using Azure;
 using Azure.ResourceManager.Models;
 using Azure.ResourceManager.SelfHelp.Models;
 
@@ -13,7 +14,7 @@ namespace Azure.ResourceManager.SelfHelp
 {
     /// <summary>
     /// Context class which will be filled in by the System.ClientModel.SourceGeneration.
-    /// For more information see 'https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/System.ClientModel/src/docs/ModelReaderWriterContext.md'
+    /// For more information <see href='https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/System.ClientModel/src/docs/ModelReaderWriterContext.md' />
     /// </summary>
     [ModelReaderWriterBuildable(typeof(AutomatedCheckResult))]
     [ModelReaderWriterBuildable(typeof(ChartFilterGroup))]
@@ -33,33 +34,39 @@ namespace Azure.ResourceManager.SelfHelp
     [ModelReaderWriterBuildable(typeof(SelfHelpDiagnosticInsight))]
     [ModelReaderWriterBuildable(typeof(SelfHelpDiagnosticInvocation))]
     [ModelReaderWriterBuildable(typeof(SelfHelpDiagnosticResource))]
+    [ModelReaderWriterBuildable(typeof(SelfHelpDiagnosticResourceProperties))]
     [ModelReaderWriterBuildable(typeof(SelfHelpDiscoverySolutionResult))]
     [ModelReaderWriterBuildable(typeof(SelfHelpError))]
     [ModelReaderWriterBuildable(typeof(SelfHelpFilter))]
-    [ModelReaderWriterBuildable(typeof(SelfHelpNameAvailabilityContent))]
-    [ModelReaderWriterBuildable(typeof(SelfHelpNameAvailabilityResult))]
+    [ModelReaderWriterBuildable(typeof(SelfHelpNlpSolutions))]
     [ModelReaderWriterBuildable(typeof(SelfHelpSection))]
-    [ModelReaderWriterBuildable(typeof(SelfHelpSimplifiedSolutionData))]
-    [ModelReaderWriterBuildable(typeof(SelfHelpSimplifiedSolutionResource))]
+    [ModelReaderWriterBuildable(typeof(SelfHelpSimplifiedSolutionsData))]
+    [ModelReaderWriterBuildable(typeof(SelfHelpSimplifiedSolutionsResource))]
     [ModelReaderWriterBuildable(typeof(SelfHelpSolutionData))]
     [ModelReaderWriterBuildable(typeof(SelfHelpSolutionMetadata))]
     [ModelReaderWriterBuildable(typeof(SelfHelpSolutionPatch))]
     [ModelReaderWriterBuildable(typeof(SelfHelpSolutionResource))]
-    [ModelReaderWriterBuildable(typeof(SelfHelpSolutionResult))]
+    [ModelReaderWriterBuildable(typeof(SelfHelpSolutionResultData))]
+    [ModelReaderWriterBuildable(typeof(SelfHelpSolutionResultResource))]
+    [ModelReaderWriterBuildable(typeof(SelfHelpSolutions))]
     [ModelReaderWriterBuildable(typeof(SelfHelpStep))]
     [ModelReaderWriterBuildable(typeof(SelfHelpTroubleshooterData))]
     [ModelReaderWriterBuildable(typeof(SelfHelpTroubleshooterResource))]
     [ModelReaderWriterBuildable(typeof(SelfHelpVideo))]
+    [ModelReaderWriterBuildable(typeof(SimplifiedSolutionsResourceProperties))]
     [ModelReaderWriterBuildable(typeof(SolutionMetadataProperties))]
     [ModelReaderWriterBuildable(typeof(SolutionNlpMetadata))]
     [ModelReaderWriterBuildable(typeof(SolutionReplacementMaps))]
+    [ModelReaderWriterBuildable(typeof(SolutionResourceProperties))]
     [ModelReaderWriterBuildable(typeof(SolutionsDiagnostic))]
     [ModelReaderWriterBuildable(typeof(SolutionSection))]
+    [ModelReaderWriterBuildable(typeof(SolutionsResourcePropertiesSelfHelp))]
     [ModelReaderWriterBuildable(typeof(SolutionsTroubleshooters))]
     [ModelReaderWriterBuildable(typeof(SolutionTriggerCriterion))]
     [ModelReaderWriterBuildable(typeof(SolutionWarmUpContent))]
     [ModelReaderWriterBuildable(typeof(SystemData))]
     [ModelReaderWriterBuildable(typeof(TroubleshooterContinueContent))]
+    [ModelReaderWriterBuildable(typeof(TroubleshooterInstanceProperties))]
     [ModelReaderWriterBuildable(typeof(TroubleshooterResult))]
     [ModelReaderWriterBuildable(typeof(TroubleshooterStepInput))]
     [ModelReaderWriterBuildable(typeof(VideoGroupDetail))]
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/ChartAggregationType.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/ChartAggregationType.cs
index c94132455af2..d28ae89af621 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/ChartAggregationType.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/ChartAggregationType.cs
@@ -7,6 +7,7 @@
 
 using System;
 using System.ComponentModel;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
@@ -14,47 +15,67 @@ namespace Azure.ResourceManager.SelfHelp.Models
     public readonly partial struct ChartAggregationType : IEquatable<ChartAggregationType>
     {
         private readonly string _value;
+        private const string SumValue = "Sum";
+        private const string AvgValue = "Avg";
+        private const string CountValue = "Count";
+        private const string MinValue = "Min";
+        private const string MaxValue = "Max";
 
         /// <summary> Initializes a new instance of <see cref="ChartAggregationType"/>. </summary>
+        /// <param name="value"> The value. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
         public ChartAggregationType(string value)
         {
-            _value = value ?? throw new ArgumentNullException(nameof(value));
-        }
+            Argument.AssertNotNull(value, nameof(value));
 
-        private const string SumValue = "Sum";
-        private const string AvgValue = "Avg";
-        private const string CountValue = "Count";
-        private const string MinValue = "Min";
-        private const string MaxValue = "Max";
+            _value = value;
+        }
 
-        /// <summary> Sum. </summary>
+        /// <summary> Gets the Sum. </summary>
         public static ChartAggregationType Sum { get; } = new ChartAggregationType(SumValue);
-        /// <summary> Avg. </summary>
+
+        /// <summary> Gets the Avg. </summary>
         public static ChartAggregationType Avg { get; } = new ChartAggregationType(AvgValue);
-        /// <summary> Count. </summary>
+
+        /// <summary> Gets the Count. </summary>
         public static ChartAggregationType Count { get; } = new ChartAggregationType(CountValue);
-        /// <summary> Min. </summary>
+
+        /// <summary> Gets the Min. </summary>
         public static ChartAggregationType Min { get; } = new ChartAggregationType(MinValue);
-        /// <summary> Max. </summary>
+
+        /// <summary> Gets the Max. </summary>
         public static ChartAggregationType Max { get; } = new ChartAggregationType(MaxValue);
+
         /// <summary> Determines if two <see cref="ChartAggregationType"/> values are the same. </summary>
+        /// <param name="left"> The left value to compare. </param>
+        /// <param name="right"> The right value to compare. </param>
         public static bool operator ==(ChartAggregationType left, ChartAggregationType right) => left.Equals(right);
+
         /// <summary> Determines if two <see cref="ChartAggregationType"/> values are not the same. </summary>
+        /// <param name="left"> The left value to compare. </param>
+        /// <param name="right"> The right value to compare. </param>
         public static bool operator !=(ChartAggregationType left, ChartAggregationType right) => !left.Equals(right);
-        /// <summary> Converts a <see cref="string"/> to a <see cref="ChartAggregationType"/>. </summary>
+
+        /// <summary> Converts a string to a <see cref="ChartAggregationType"/>. </summary>
+        /// <param name="value"> The value. </param>
         public static implicit operator ChartAggregationType(string value) => new ChartAggregationType(value);
 
-        /// <inheritdoc />
+        /// <summary> Converts a string to a <see cref="ChartAggregationType"/>. </summary>
+        /// <param name="value"> The value. </param>
+        public static implicit operator ChartAggregationType?(string value) => value == null ? null : new ChartAggregationType(value);
+
+        /// <inheritdoc/>
         [EditorBrowsable(EditorBrowsableState.Never)]
         public override bool Equals(object obj) => obj is ChartAggregationType other && Equals(other);
-        /// <inheritdoc />
+
+        /// <inheritdoc/>
         public bool Equals(ChartAggregationType other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
 
-        /// <inheritdoc />
+        /// <inheritdoc/>
         [EditorBrowsable(EditorBrowsableState.Never)]
         public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
-        /// <inheritdoc />
+
+        /// <inheritdoc/>
         public override string ToString() => _value;
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/ChartFilterGroup.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/ChartFilterGroup.Serialization.cs
index cdf5fb02a4ce..5f169572fdb7 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/ChartFilterGroup.Serialization.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/ChartFilterGroup.Serialization.cs
@@ -9,14 +9,15 @@
 using System.ClientModel.Primitives;
 using System.Collections.Generic;
 using System.Text.Json;
-using Azure.Core;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
-    internal partial class ChartFilterGroup : IUtf8JsonSerializable, IJsonModel<ChartFilterGroup>
+    /// <summary> Filter group. </summary>
+    internal partial class ChartFilterGroup : IJsonModel<ChartFilterGroup>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ChartFilterGroup>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
+        /// <param name="writer"> The JSON writer. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
         void IJsonModel<ChartFilterGroup>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
@@ -28,31 +29,30 @@ void IJsonModel<ChartFilterGroup>.Write(Utf8JsonWriter writer, ModelReaderWriter
         /// <param name="options"> The client options for reading and writing models. </param>
         protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<ChartFilterGroup>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<ChartFilterGroup>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(ChartFilterGroup)} does not support writing '{format}' format.");
             }
-
             if (Optional.IsCollectionDefined(Filter))
             {
                 writer.WritePropertyName("filter"u8);
                 writer.WriteStartArray();
-                foreach (var item in Filter)
+                foreach (SelfHelpFilter item in Filter)
                 {
                     writer.WriteObjectValue(item, options);
                 }
                 writer.WriteEndArray();
             }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            if (options.Format != "W" && _additionalBinaryDataProperties != null)
             {
-                foreach (var item in _serializedAdditionalRawData)
+                foreach (var item in _additionalBinaryDataProperties)
                 {
                     writer.WritePropertyName(item.Key);
 #if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
+                    writer.WriteRawValue(item.Value);
 #else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value, ModelSerializationExtensions.JsonDocumentOptions))
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
                     {
                         JsonSerializer.Serialize(writer, document.RootElement);
                     }
@@ -61,39 +61,43 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             }
         }
 
-        ChartFilterGroup IJsonModel<ChartFilterGroup>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        ChartFilterGroup IJsonModel<ChartFilterGroup>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options);
+
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual ChartFilterGroup JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<ChartFilterGroup>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<ChartFilterGroup>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(ChartFilterGroup)} does not support reading '{format}' format.");
             }
-
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
             return DeserializeChartFilterGroup(document.RootElement, options);
         }
 
-        internal static ChartFilterGroup DeserializeChartFilterGroup(JsonElement element, ModelReaderWriterOptions options = null)
+        /// <param name="element"> The JSON element to deserialize. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        internal static ChartFilterGroup DeserializeChartFilterGroup(JsonElement element, ModelReaderWriterOptions options)
         {
-            options ??= ModelSerializationExtensions.WireOptions;
-
             if (element.ValueKind == JsonValueKind.Null)
             {
                 return null;
             }
-            IReadOnlyList<SelfHelpFilter> filter = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
+            IList<SelfHelpFilter> filter = default;
+            IDictionary<string, BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            foreach (var prop in element.EnumerateObject())
             {
-                if (property.NameEquals("filter"u8))
+                if (prop.NameEquals("filter"u8))
                 {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
                     List<SelfHelpFilter> array = new List<SelfHelpFilter>();
-                    foreach (var item in property.Value.EnumerateArray())
+                    foreach (var item in prop.Value.EnumerateArray())
                     {
                         array.Add(SelfHelpFilter.DeserializeSelfHelpFilter(item, options));
                     }
@@ -102,17 +106,19 @@ internal static ChartFilterGroup DeserializeChartFilterGroup(JsonElement element
                 }
                 if (options.Format != "W")
                 {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                    additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText()));
                 }
             }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ChartFilterGroup(filter ?? new ChangeTrackingList<SelfHelpFilter>(), serializedAdditionalRawData);
+            return new ChartFilterGroup(filter ?? new ChangeTrackingList<SelfHelpFilter>(), additionalBinaryDataProperties);
         }
 
-        BinaryData IPersistableModel<ChartFilterGroup>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ChartFilterGroup>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="options"> The client options for reading and writing models. </param>
+        BinaryData IPersistableModel<ChartFilterGroup>.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
 
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<ChartFilterGroup>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
@@ -122,15 +128,20 @@ BinaryData IPersistableModel<ChartFilterGroup>.Write(ModelReaderWriterOptions op
             }
         }
 
-        ChartFilterGroup IPersistableModel<ChartFilterGroup>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ChartFilterGroup>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        ChartFilterGroup IPersistableModel<ChartFilterGroup>.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options);
 
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual ChartFilterGroup PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<ChartFilterGroup>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
+                    using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
                     {
-                        using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
                         return DeserializeChartFilterGroup(document.RootElement, options);
                     }
                 default:
@@ -138,6 +149,7 @@ ChartFilterGroup IPersistableModel<ChartFilterGroup>.Create(BinaryData data, Mod
             }
         }
 
+        /// <param name="options"> The client options for reading and writing models. </param>
         string IPersistableModel<ChartFilterGroup>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/ChartFilterGroup.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/ChartFilterGroup.cs
index f0d284df8282..89fa669ec75a 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/ChartFilterGroup.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/ChartFilterGroup.cs
@@ -7,43 +7,15 @@
 
 using System;
 using System.Collections.Generic;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
     /// <summary> Filter group. </summary>
     internal partial class ChartFilterGroup
     {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+        /// <summary> Keeps track of any properties unknown to the library. </summary>
+        private protected readonly IDictionary<string, BinaryData> _additionalBinaryDataProperties;
 
         /// <summary> Initializes a new instance of <see cref="ChartFilterGroup"/>. </summary>
         internal ChartFilterGroup()
@@ -53,14 +25,14 @@ internal ChartFilterGroup()
 
         /// <summary> Initializes a new instance of <see cref="ChartFilterGroup"/>. </summary>
         /// <param name="filter"> List of filters. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ChartFilterGroup(IReadOnlyList<SelfHelpFilter> filter, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        /// <param name="additionalBinaryDataProperties"> Keeps track of any properties unknown to the library. </param>
+        internal ChartFilterGroup(IList<SelfHelpFilter> filter, IDictionary<string, BinaryData> additionalBinaryDataProperties)
         {
             Filter = filter;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
+            _additionalBinaryDataProperties = additionalBinaryDataProperties;
         }
 
         /// <summary> List of filters. </summary>
-        public IReadOnlyList<SelfHelpFilter> Filter { get; }
+        public IList<SelfHelpFilter> Filter { get; }
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/ClassificationService.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/ClassificationService.Serialization.cs
index 00dfa50aa9fd..d358e8e1144c 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/ClassificationService.Serialization.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/ClassificationService.Serialization.cs
@@ -10,13 +10,15 @@
 using System.Collections.Generic;
 using System.Text.Json;
 using Azure.Core;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
-    public partial class ClassificationService : IUtf8JsonSerializable, IJsonModel<ClassificationService>
+    /// <summary> Service Classification result object. </summary>
+    public partial class ClassificationService : IJsonModel<ClassificationService>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ClassificationService>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
+        /// <param name="writer"> The JSON writer. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
         void IJsonModel<ClassificationService>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
@@ -28,12 +30,11 @@ void IJsonModel<ClassificationService>.Write(Utf8JsonWriter writer, ModelReaderW
         /// <param name="options"> The client options for reading and writing models. </param>
         protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<ClassificationService>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<ClassificationService>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(ClassificationService)} does not support writing '{format}' format.");
             }
-
             if (options.Format != "W" && Optional.IsDefined(ServiceId))
             {
                 writer.WritePropertyName("serviceId"u8);
@@ -48,21 +49,26 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             {
                 writer.WritePropertyName("resourceTypes"u8);
                 writer.WriteStartArray();
-                foreach (var item in ResourceTypes)
+                foreach (string item in ResourceTypes)
                 {
+                    if (item == null)
+                    {
+                        writer.WriteNullValue();
+                        continue;
+                    }
                     writer.WriteStringValue(item);
                 }
                 writer.WriteEndArray();
             }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            if (options.Format != "W" && _additionalBinaryDataProperties != null)
             {
-                foreach (var item in _serializedAdditionalRawData)
+                foreach (var item in _additionalBinaryDataProperties)
                 {
                     writer.WritePropertyName(item.Key);
 #if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
+                    writer.WriteRawValue(item.Value);
 #else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value, ModelSerializationExtensions.JsonDocumentOptions))
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
                     {
                         JsonSerializer.Serialize(writer, document.RootElement);
                     }
@@ -71,22 +77,27 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             }
         }
 
-        ClassificationService IJsonModel<ClassificationService>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        ClassificationService IJsonModel<ClassificationService>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options);
+
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual ClassificationService JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<ClassificationService>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<ClassificationService>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(ClassificationService)} does not support reading '{format}' format.");
             }
-
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
             return DeserializeClassificationService(document.RootElement, options);
         }
 
-        internal static ClassificationService DeserializeClassificationService(JsonElement element, ModelReaderWriterOptions options = null)
+        /// <param name="element"> The JSON element to deserialize. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        internal static ClassificationService DeserializeClassificationService(JsonElement element, ModelReaderWriterOptions options)
         {
-            options ??= ModelSerializationExtensions.WireOptions;
-
             if (element.ValueKind == JsonValueKind.Null)
             {
                 return null;
@@ -94,51 +105,59 @@ internal static ClassificationService DeserializeClassificationService(JsonEleme
             ResourceIdentifier serviceId = default;
             string displayName = default;
             IList<string> resourceTypes = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
+            IDictionary<string, BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            foreach (var prop in element.EnumerateObject())
             {
-                if (property.NameEquals("serviceId"u8))
+                if (prop.NameEquals("serviceId"u8))
                 {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
-                    serviceId = new ResourceIdentifier(property.Value.GetString());
+                    serviceId = new ResourceIdentifier(prop.Value.GetString());
                     continue;
                 }
-                if (property.NameEquals("displayName"u8))
+                if (prop.NameEquals("displayName"u8))
                 {
-                    displayName = property.Value.GetString();
+                    displayName = prop.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("resourceTypes"u8))
+                if (prop.NameEquals("resourceTypes"u8))
                 {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
                     List<string> array = new List<string>();
-                    foreach (var item in property.Value.EnumerateArray())
+                    foreach (var item in prop.Value.EnumerateArray())
                     {
-                        array.Add(item.GetString());
+                        if (item.ValueKind == JsonValueKind.Null)
+                        {
+                            array.Add(null);
+                        }
+                        else
+                        {
+                            array.Add(item.GetString());
+                        }
                     }
                     resourceTypes = array;
                     continue;
                 }
                 if (options.Format != "W")
                 {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                    additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText()));
                 }
             }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ClassificationService(serviceId, displayName, resourceTypes ?? new ChangeTrackingList<string>(), serializedAdditionalRawData);
+            return new ClassificationService(serviceId, displayName, resourceTypes ?? new ChangeTrackingList<string>(), additionalBinaryDataProperties);
         }
 
-        BinaryData IPersistableModel<ClassificationService>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ClassificationService>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="options"> The client options for reading and writing models. </param>
+        BinaryData IPersistableModel<ClassificationService>.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
 
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<ClassificationService>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
@@ -148,15 +167,20 @@ BinaryData IPersistableModel<ClassificationService>.Write(ModelReaderWriterOptio
             }
         }
 
-        ClassificationService IPersistableModel<ClassificationService>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ClassificationService>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        ClassificationService IPersistableModel<ClassificationService>.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options);
 
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual ClassificationService PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<ClassificationService>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
+                    using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
                     {
-                        using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
                         return DeserializeClassificationService(document.RootElement, options);
                     }
                 default:
@@ -164,6 +188,7 @@ ClassificationService IPersistableModel<ClassificationService>.Create(BinaryData
             }
         }
 
+        /// <param name="options"> The client options for reading and writing models. </param>
         string IPersistableModel<ClassificationService>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/ClassificationService.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/ClassificationService.cs
index 3b0d2000624e..6a18a04e914e 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/ClassificationService.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/ClassificationService.cs
@@ -8,43 +8,15 @@
 using System;
 using System.Collections.Generic;
 using Azure.Core;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
     /// <summary> Service Classification result object. </summary>
     public partial class ClassificationService
     {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+        /// <summary> Keeps track of any properties unknown to the library. </summary>
+        private protected readonly IDictionary<string, BinaryData> _additionalBinaryDataProperties;
 
         /// <summary> Initializes a new instance of <see cref="ClassificationService"/>. </summary>
         public ClassificationService()
@@ -56,19 +28,21 @@ public ClassificationService()
         /// <param name="serviceId"> Azure resource Id of the service. </param>
         /// <param name="displayName"> Localized name of the azure service. </param>
         /// <param name="resourceTypes"> List of applicable ARM resource types for this service. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ClassificationService(ResourceIdentifier serviceId, string displayName, IList<string> resourceTypes, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        /// <param name="additionalBinaryDataProperties"> Keeps track of any properties unknown to the library. </param>
+        internal ClassificationService(ResourceIdentifier serviceId, string displayName, IList<string> resourceTypes, IDictionary<string, BinaryData> additionalBinaryDataProperties)
         {
             ServiceId = serviceId;
             DisplayName = displayName;
             ResourceTypes = resourceTypes;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
+            _additionalBinaryDataProperties = additionalBinaryDataProperties;
         }
 
         /// <summary> Azure resource Id of the service. </summary>
         public ResourceIdentifier ServiceId { get; }
+
         /// <summary> Localized name of the azure service. </summary>
         public string DisplayName { get; }
+
         /// <summary> List of applicable ARM resource types for this service. </summary>
         public IList<string> ResourceTypes { get; }
     }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/DiscoveryNlpContent.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/DiscoveryNlpContent.Serialization.cs
index e1dd97399dfc..960b8b2401f1 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/DiscoveryNlpContent.Serialization.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/DiscoveryNlpContent.Serialization.cs
@@ -10,13 +10,20 @@
 using System.Collections.Generic;
 using System.Text.Json;
 using Azure.Core;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
-    public partial class DiscoveryNlpContent : IUtf8JsonSerializable, IJsonModel<DiscoveryNlpContent>
+    /// <summary> Discover NLP request. </summary>
+    public partial class DiscoveryNlpContent : IJsonModel<DiscoveryNlpContent>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<DiscoveryNlpContent>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+        /// <summary> Initializes a new instance of <see cref="DiscoveryNlpContent"/> for deserialization. </summary>
+        internal DiscoveryNlpContent()
+        {
+        }
 
+        /// <param name="writer"> The JSON writer. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
         void IJsonModel<DiscoveryNlpContent>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
@@ -28,12 +35,11 @@ void IJsonModel<DiscoveryNlpContent>.Write(Utf8JsonWriter writer, ModelReaderWri
         /// <param name="options"> The client options for reading and writing models. </param>
         protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DiscoveryNlpContent>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<DiscoveryNlpContent>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(DiscoveryNlpContent)} does not support writing '{format}' format.");
             }
-
             writer.WritePropertyName("issueSummary"u8);
             writer.WriteStringValue(IssueSummary);
             if (Optional.IsDefined(ResourceId))
@@ -51,15 +57,15 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
                 writer.WritePropertyName("additionalContext"u8);
                 writer.WriteStringValue(AdditionalContext);
             }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            if (options.Format != "W" && _additionalBinaryDataProperties != null)
             {
-                foreach (var item in _serializedAdditionalRawData)
+                foreach (var item in _additionalBinaryDataProperties)
                 {
                     writer.WritePropertyName(item.Key);
 #if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
+                    writer.WriteRawValue(item.Value);
 #else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value, ModelSerializationExtensions.JsonDocumentOptions))
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
                     {
                         JsonSerializer.Serialize(writer, document.RootElement);
                     }
@@ -68,22 +74,27 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             }
         }
 
-        DiscoveryNlpContent IJsonModel<DiscoveryNlpContent>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        DiscoveryNlpContent IJsonModel<DiscoveryNlpContent>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options);
+
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual DiscoveryNlpContent JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DiscoveryNlpContent>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<DiscoveryNlpContent>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(DiscoveryNlpContent)} does not support reading '{format}' format.");
             }
-
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
             return DeserializeDiscoveryNlpContent(document.RootElement, options);
         }
 
-        internal static DiscoveryNlpContent DeserializeDiscoveryNlpContent(JsonElement element, ModelReaderWriterOptions options = null)
+        /// <param name="element"> The JSON element to deserialize. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        internal static DiscoveryNlpContent DeserializeDiscoveryNlpContent(JsonElement element, ModelReaderWriterOptions options)
         {
-            options ??= ModelSerializationExtensions.WireOptions;
-
             if (element.ValueKind == JsonValueKind.Null)
             {
                 return null;
@@ -92,43 +103,44 @@ internal static DiscoveryNlpContent DeserializeDiscoveryNlpContent(JsonElement e
             string resourceId = default;
             string serviceId = default;
             string additionalContext = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
+            IDictionary<string, BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            foreach (var prop in element.EnumerateObject())
             {
-                if (property.NameEquals("issueSummary"u8))
+                if (prop.NameEquals("issueSummary"u8))
                 {
-                    issueSummary = property.Value.GetString();
+                    issueSummary = prop.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("resourceId"u8))
+                if (prop.NameEquals("resourceId"u8))
                 {
-                    resourceId = property.Value.GetString();
+                    resourceId = prop.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("serviceId"u8))
+                if (prop.NameEquals("serviceId"u8))
                 {
-                    serviceId = property.Value.GetString();
+                    serviceId = prop.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("additionalContext"u8))
+                if (prop.NameEquals("additionalContext"u8))
                 {
-                    additionalContext = property.Value.GetString();
+                    additionalContext = prop.Value.GetString();
                     continue;
                 }
                 if (options.Format != "W")
                 {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                    additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText()));
                 }
             }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new DiscoveryNlpContent(issueSummary, resourceId, serviceId, additionalContext, serializedAdditionalRawData);
+            return new DiscoveryNlpContent(issueSummary, resourceId, serviceId, additionalContext, additionalBinaryDataProperties);
         }
 
-        BinaryData IPersistableModel<DiscoveryNlpContent>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<DiscoveryNlpContent>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="options"> The client options for reading and writing models. </param>
+        BinaryData IPersistableModel<DiscoveryNlpContent>.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
 
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<DiscoveryNlpContent>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
@@ -138,15 +150,20 @@ BinaryData IPersistableModel<DiscoveryNlpContent>.Write(ModelReaderWriterOptions
             }
         }
 
-        DiscoveryNlpContent IPersistableModel<DiscoveryNlpContent>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<DiscoveryNlpContent>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        DiscoveryNlpContent IPersistableModel<DiscoveryNlpContent>.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options);
 
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual DiscoveryNlpContent PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<DiscoveryNlpContent>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
+                    using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
                     {
-                        using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
                         return DeserializeDiscoveryNlpContent(document.RootElement, options);
                     }
                 default:
@@ -154,6 +171,19 @@ DiscoveryNlpContent IPersistableModel<DiscoveryNlpContent>.Create(BinaryData dat
             }
         }
 
+        /// <param name="options"> The client options for reading and writing models. </param>
         string IPersistableModel<DiscoveryNlpContent>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <param name="discoveryNlpContent"> The <see cref="DiscoveryNlpContent"/> to serialize into <see cref="RequestContent"/>. </param>
+        internal static RequestContent ToRequestContent(DiscoveryNlpContent discoveryNlpContent)
+        {
+            if (discoveryNlpContent == null)
+            {
+                return null;
+            }
+            Utf8JsonRequestContent content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(discoveryNlpContent, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/DiscoveryNlpContent.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/DiscoveryNlpContent.cs
index 905e97a666ac..01cfbb37dd07 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/DiscoveryNlpContent.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/DiscoveryNlpContent.cs
@@ -7,43 +7,15 @@
 
 using System;
 using System.Collections.Generic;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
     /// <summary> Discover NLP request. </summary>
     public partial class DiscoveryNlpContent
     {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+        /// <summary> Keeps track of any properties unknown to the library. </summary>
+        private protected readonly IDictionary<string, BinaryData> _additionalBinaryDataProperties;
 
         /// <summary> Initializes a new instance of <see cref="DiscoveryNlpContent"/>. </summary>
         /// <param name="issueSummary"> Natural language description of the issue. </param>
@@ -60,27 +32,25 @@ public DiscoveryNlpContent(string issueSummary)
         /// <param name="resourceId"> ARM resource Id of the resource that is having the issue. Only applicable for Discovery Solution NLP Subscription Scope. </param>
         /// <param name="serviceId"> ARM service Id of the service that is having the issue. For more information on service Id see https://learn.microsoft.com/rest/api/support/services/list?tabs=HTTP. </param>
         /// <param name="additionalContext"> Additional information in the form of a string. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal DiscoveryNlpContent(string issueSummary, string resourceId, string serviceId, string additionalContext, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        /// <param name="additionalBinaryDataProperties"> Keeps track of any properties unknown to the library. </param>
+        internal DiscoveryNlpContent(string issueSummary, string resourceId, string serviceId, string additionalContext, IDictionary<string, BinaryData> additionalBinaryDataProperties)
         {
             IssueSummary = issueSummary;
             ResourceId = resourceId;
             ServiceId = serviceId;
             AdditionalContext = additionalContext;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="DiscoveryNlpContent"/> for deserialization. </summary>
-        internal DiscoveryNlpContent()
-        {
+            _additionalBinaryDataProperties = additionalBinaryDataProperties;
         }
 
         /// <summary> Natural language description of the issue. </summary>
         public string IssueSummary { get; }
+
         /// <summary> ARM resource Id of the resource that is having the issue. Only applicable for Discovery Solution NLP Subscription Scope. </summary>
         public string ResourceId { get; set; }
+
         /// <summary> ARM service Id of the service that is having the issue. For more information on service Id see https://learn.microsoft.com/rest/api/support/services/list?tabs=HTTP. </summary>
         public string ServiceId { get; set; }
+
         /// <summary> Additional information in the form of a string. </summary>
         public string AdditionalContext { get; set; }
     }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/DiscoveryNlpResult.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/DiscoveryNlpResult.Serialization.cs
index 7b352be762bf..214874299c1b 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/DiscoveryNlpResult.Serialization.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/DiscoveryNlpResult.Serialization.cs
@@ -9,14 +9,16 @@
 using System.ClientModel.Primitives;
 using System.Collections.Generic;
 using System.Text.Json;
-using Azure.Core;
+using Azure;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
-    internal partial class DiscoveryNlpResult : IUtf8JsonSerializable, IJsonModel<DiscoveryNlpResult>
+    /// <summary> Successfully fetched list of solution metadata. </summary>
+    public partial class DiscoveryNlpResult : IJsonModel<DiscoveryNlpResult>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<DiscoveryNlpResult>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
+        /// <param name="writer"> The JSON writer. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
         void IJsonModel<DiscoveryNlpResult>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
@@ -28,31 +30,30 @@ void IJsonModel<DiscoveryNlpResult>.Write(Utf8JsonWriter writer, ModelReaderWrit
         /// <param name="options"> The client options for reading and writing models. </param>
         protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DiscoveryNlpResult>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<DiscoveryNlpResult>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(DiscoveryNlpResult)} does not support writing '{format}' format.");
             }
-
             if (Optional.IsCollectionDefined(Value))
             {
                 writer.WritePropertyName("value"u8);
                 writer.WriteStartArray();
-                foreach (var item in Value)
+                foreach (SolutionNlpMetadata item in Value)
                 {
                     writer.WriteObjectValue(item, options);
                 }
                 writer.WriteEndArray();
             }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            if (options.Format != "W" && _additionalBinaryDataProperties != null)
             {
-                foreach (var item in _serializedAdditionalRawData)
+                foreach (var item in _additionalBinaryDataProperties)
                 {
                     writer.WritePropertyName(item.Key);
 #if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
+                    writer.WriteRawValue(item.Value);
 #else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value, ModelSerializationExtensions.JsonDocumentOptions))
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
                     {
                         JsonSerializer.Serialize(writer, document.RootElement);
                     }
@@ -61,39 +62,43 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             }
         }
 
-        DiscoveryNlpResult IJsonModel<DiscoveryNlpResult>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        DiscoveryNlpResult IJsonModel<DiscoveryNlpResult>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options);
+
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual DiscoveryNlpResult JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<DiscoveryNlpResult>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<DiscoveryNlpResult>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(DiscoveryNlpResult)} does not support reading '{format}' format.");
             }
-
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
             return DeserializeDiscoveryNlpResult(document.RootElement, options);
         }
 
-        internal static DiscoveryNlpResult DeserializeDiscoveryNlpResult(JsonElement element, ModelReaderWriterOptions options = null)
+        /// <param name="element"> The JSON element to deserialize. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        internal static DiscoveryNlpResult DeserializeDiscoveryNlpResult(JsonElement element, ModelReaderWriterOptions options)
         {
-            options ??= ModelSerializationExtensions.WireOptions;
-
             if (element.ValueKind == JsonValueKind.Null)
             {
                 return null;
             }
-            IReadOnlyList<SolutionNlpMetadata> value = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
+            IList<SolutionNlpMetadata> value = default;
+            IDictionary<string, BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            foreach (var prop in element.EnumerateObject())
             {
-                if (property.NameEquals("value"u8))
+                if (prop.NameEquals("value"u8))
                 {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
                     List<SolutionNlpMetadata> array = new List<SolutionNlpMetadata>();
-                    foreach (var item in property.Value.EnumerateArray())
+                    foreach (var item in prop.Value.EnumerateArray())
                     {
                         array.Add(SolutionNlpMetadata.DeserializeSolutionNlpMetadata(item, options));
                     }
@@ -102,17 +107,19 @@ internal static DiscoveryNlpResult DeserializeDiscoveryNlpResult(JsonElement ele
                 }
                 if (options.Format != "W")
                 {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                    additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText()));
                 }
             }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new DiscoveryNlpResult(value ?? new ChangeTrackingList<SolutionNlpMetadata>(), serializedAdditionalRawData);
+            return new DiscoveryNlpResult(value ?? new ChangeTrackingList<SolutionNlpMetadata>(), additionalBinaryDataProperties);
         }
 
-        BinaryData IPersistableModel<DiscoveryNlpResult>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<DiscoveryNlpResult>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="options"> The client options for reading and writing models. </param>
+        BinaryData IPersistableModel<DiscoveryNlpResult>.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
 
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<DiscoveryNlpResult>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
@@ -122,15 +129,20 @@ BinaryData IPersistableModel<DiscoveryNlpResult>.Write(ModelReaderWriterOptions
             }
         }
 
-        DiscoveryNlpResult IPersistableModel<DiscoveryNlpResult>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<DiscoveryNlpResult>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        DiscoveryNlpResult IPersistableModel<DiscoveryNlpResult>.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options);
 
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual DiscoveryNlpResult PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<DiscoveryNlpResult>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
+                    using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
                     {
-                        using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
                         return DeserializeDiscoveryNlpResult(document.RootElement, options);
                     }
                 default:
@@ -138,6 +150,14 @@ DiscoveryNlpResult IPersistableModel<DiscoveryNlpResult>.Create(BinaryData data,
             }
         }
 
+        /// <param name="options"> The client options for reading and writing models. </param>
         string IPersistableModel<DiscoveryNlpResult>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <param name="response"> The <see cref="Response"/> to deserialize the <see cref="DiscoveryNlpResult"/> from. </param>
+        internal static DiscoveryNlpResult FromResponse(Response response)
+        {
+            using JsonDocument document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions);
+            return DeserializeDiscoveryNlpResult(document.RootElement, ModelSerializationExtensions.WireOptions);
+        }
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/DiscoveryNlpResult.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/DiscoveryNlpResult.cs
index b85e6546862a..149d31081a44 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/DiscoveryNlpResult.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/DiscoveryNlpResult.cs
@@ -7,43 +7,15 @@
 
 using System;
 using System.Collections.Generic;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
     /// <summary> Successfully fetched list of solution metadata. </summary>
-    internal partial class DiscoveryNlpResult
+    public partial class DiscoveryNlpResult
     {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+        /// <summary> Keeps track of any properties unknown to the library. </summary>
+        private protected readonly IDictionary<string, BinaryData> _additionalBinaryDataProperties;
 
         /// <summary> Initializes a new instance of <see cref="DiscoveryNlpResult"/>. </summary>
         internal DiscoveryNlpResult()
@@ -53,14 +25,14 @@ internal DiscoveryNlpResult()
 
         /// <summary> Initializes a new instance of <see cref="DiscoveryNlpResult"/>. </summary>
         /// <param name="value"> The list of solution metadata. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal DiscoveryNlpResult(IReadOnlyList<SolutionNlpMetadata> value, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        /// <param name="additionalBinaryDataProperties"> Keeps track of any properties unknown to the library. </param>
+        internal DiscoveryNlpResult(IList<SolutionNlpMetadata> value, IDictionary<string, BinaryData> additionalBinaryDataProperties)
         {
             Value = value;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
+            _additionalBinaryDataProperties = additionalBinaryDataProperties;
         }
 
         /// <summary> The list of solution metadata. </summary>
-        public IReadOnlyList<SolutionNlpMetadata> Value { get; }
+        public IList<SolutionNlpMetadata> Value { get; }
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/KBSearchResult.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/KBSearchResult.Serialization.cs
index 00c6fb5e84dd..3939eef2e943 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/KBSearchResult.Serialization.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/KBSearchResult.Serialization.cs
@@ -9,14 +9,15 @@
 using System.ClientModel.Primitives;
 using System.Collections.Generic;
 using System.Text.Json;
-using Azure.Core;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
-    public partial class KBSearchResult : IUtf8JsonSerializable, IJsonModel<KBSearchResult>
+    /// <summary> Details of an AzureKB search result. </summary>
+    public partial class KBSearchResult : IJsonModel<KBSearchResult>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<KBSearchResult>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
+        /// <param name="writer"> The JSON writer. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
         void IJsonModel<KBSearchResult>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
@@ -28,12 +29,11 @@ void IJsonModel<KBSearchResult>.Write(Utf8JsonWriter writer, ModelReaderWriterOp
         /// <param name="options"> The client options for reading and writing models. </param>
         protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<KBSearchResult>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<KBSearchResult>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(KBSearchResult)} does not support writing '{format}' format.");
             }
-
             if (Optional.IsDefined(SolutionId))
             {
                 writer.WritePropertyName("solutionId"u8);
@@ -74,15 +74,15 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
                 writer.WritePropertyName("link"u8);
                 writer.WriteStringValue(Link);
             }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            if (options.Format != "W" && _additionalBinaryDataProperties != null)
             {
-                foreach (var item in _serializedAdditionalRawData)
+                foreach (var item in _additionalBinaryDataProperties)
                 {
                     writer.WritePropertyName(item.Key);
 #if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
+                    writer.WriteRawValue(item.Value);
 #else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value, ModelSerializationExtensions.JsonDocumentOptions))
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
                     {
                         JsonSerializer.Serialize(writer, document.RootElement);
                     }
@@ -91,22 +91,27 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             }
         }
 
-        KBSearchResult IJsonModel<KBSearchResult>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        KBSearchResult IJsonModel<KBSearchResult>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options);
+
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual KBSearchResult JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<KBSearchResult>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<KBSearchResult>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(KBSearchResult)} does not support reading '{format}' format.");
             }
-
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
             return DeserializeKBSearchResult(document.RootElement, options);
         }
 
-        internal static KBSearchResult DeserializeKBSearchResult(JsonElement element, ModelReaderWriterOptions options = null)
+        /// <param name="element"> The JSON element to deserialize. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        internal static KBSearchResult DeserializeKBSearchResult(JsonElement element, ModelReaderWriterOptions options)
         {
-            options ??= ModelSerializationExtensions.WireOptions;
-
             if (element.ValueKind == JsonValueKind.Null)
             {
                 return null;
@@ -119,68 +124,66 @@ internal static KBSearchResult DeserializeKBSearchResult(JsonElement element, Mo
             KBSearchResultType? resultType = default;
             int? rank = default;
             string link = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
+            IDictionary<string, BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            foreach (var prop in element.EnumerateObject())
             {
-                if (property.NameEquals("solutionId"u8))
+                if (prop.NameEquals("solutionId"u8))
                 {
-                    solutionId = property.Value.GetString();
+                    solutionId = prop.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("content"u8))
+                if (prop.NameEquals("content"u8))
                 {
-                    content = property.Value.GetString();
+                    content = prop.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("title"u8))
+                if (prop.NameEquals("title"u8))
                 {
-                    title = property.Value.GetString();
+                    title = prop.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("confidence"u8))
+                if (prop.NameEquals("confidence"u8))
                 {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
-                    confidence = new SelfHelpConfidence(property.Value.GetString());
+                    confidence = new SelfHelpConfidence(prop.Value.GetString());
                     continue;
                 }
-                if (property.NameEquals("source"u8))
+                if (prop.NameEquals("source"u8))
                 {
-                    source = property.Value.GetString();
+                    source = prop.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("resultType"u8))
+                if (prop.NameEquals("resultType"u8))
                 {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
-                    resultType = new KBSearchResultType(property.Value.GetString());
+                    resultType = new KBSearchResultType(prop.Value.GetString());
                     continue;
                 }
-                if (property.NameEquals("rank"u8))
+                if (prop.NameEquals("rank"u8))
                 {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
-                    rank = property.Value.GetInt32();
+                    rank = prop.Value.GetInt32();
                     continue;
                 }
-                if (property.NameEquals("link"u8))
+                if (prop.NameEquals("link"u8))
                 {
-                    link = property.Value.GetString();
+                    link = prop.Value.GetString();
                     continue;
                 }
                 if (options.Format != "W")
                 {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                    additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText()));
                 }
             }
-            serializedAdditionalRawData = rawDataDictionary;
             return new KBSearchResult(
                 solutionId,
                 content,
@@ -190,13 +193,16 @@ internal static KBSearchResult DeserializeKBSearchResult(JsonElement element, Mo
                 resultType,
                 rank,
                 link,
-                serializedAdditionalRawData);
+                additionalBinaryDataProperties);
         }
 
-        BinaryData IPersistableModel<KBSearchResult>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<KBSearchResult>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="options"> The client options for reading and writing models. </param>
+        BinaryData IPersistableModel<KBSearchResult>.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
 
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<KBSearchResult>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
@@ -206,15 +212,20 @@ BinaryData IPersistableModel<KBSearchResult>.Write(ModelReaderWriterOptions opti
             }
         }
 
-        KBSearchResult IPersistableModel<KBSearchResult>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<KBSearchResult>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        KBSearchResult IPersistableModel<KBSearchResult>.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options);
 
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual KBSearchResult PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<KBSearchResult>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
+                    using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
                     {
-                        using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
                         return DeserializeKBSearchResult(document.RootElement, options);
                     }
                 default:
@@ -222,6 +233,7 @@ KBSearchResult IPersistableModel<KBSearchResult>.Create(BinaryData data, ModelRe
             }
         }
 
+        /// <param name="options"> The client options for reading and writing models. </param>
         string IPersistableModel<KBSearchResult>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/KBSearchResult.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/KBSearchResult.cs
index a70621fac101..74a498ae17cf 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/KBSearchResult.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/KBSearchResult.cs
@@ -13,37 +13,8 @@ namespace Azure.ResourceManager.SelfHelp.Models
     /// <summary> Details of an AzureKB search result. </summary>
     public partial class KBSearchResult
     {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+        /// <summary> Keeps track of any properties unknown to the library. </summary>
+        private protected readonly IDictionary<string, BinaryData> _additionalBinaryDataProperties;
 
         /// <summary> Initializes a new instance of <see cref="KBSearchResult"/>. </summary>
         internal KBSearchResult()
@@ -59,8 +30,8 @@ internal KBSearchResult()
         /// <param name="resultType"> Result type of the search result. </param>
         /// <param name="rank"> rank of the search result. </param>
         /// <param name="link"> Link to the document. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal KBSearchResult(string solutionId, string content, string title, SelfHelpConfidence? confidence, string source, KBSearchResultType? resultType, int? rank, string link, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        /// <param name="additionalBinaryDataProperties"> Keeps track of any properties unknown to the library. </param>
+        internal KBSearchResult(string solutionId, string content, string title, SelfHelpConfidence? confidence, string source, KBSearchResultType? resultType, int? rank, string link, IDictionary<string, BinaryData> additionalBinaryDataProperties)
         {
             SolutionId = solutionId;
             Content = content;
@@ -70,23 +41,30 @@ internal KBSearchResult(string solutionId, string content, string title, SelfHel
             ResultType = resultType;
             Rank = rank;
             Link = link;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
+            _additionalBinaryDataProperties = additionalBinaryDataProperties;
         }
 
         /// <summary> Unique id of the result. </summary>
         public string SolutionId { get; }
+
         /// <summary> Content of the search result. </summary>
         public string Content { get; }
+
         /// <summary> Title of the search result. </summary>
         public string Title { get; }
+
         /// <summary> Confidence of the search result. </summary>
         public SelfHelpConfidence? Confidence { get; }
+
         /// <summary> Source of the search result. </summary>
         public string Source { get; }
+
         /// <summary> Result type of the search result. </summary>
         public KBSearchResultType? ResultType { get; }
+
         /// <summary> rank of the search result. </summary>
         public int? Rank { get; }
+
         /// <summary> Link to the document. </summary>
         public string Link { get; }
     }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/KBSearchResultType.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/KBSearchResultType.cs
index 0fd0bdbc6daa..1b71c95deee8 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/KBSearchResultType.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/KBSearchResultType.cs
@@ -7,6 +7,7 @@
 
 using System;
 using System.ComponentModel;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
@@ -14,38 +15,55 @@ namespace Azure.ResourceManager.SelfHelp.Models
     public readonly partial struct KBSearchResultType : IEquatable<KBSearchResultType>
     {
         private readonly string _value;
+        private const string CommunityValue = "Community";
+        private const string DocumentationValue = "Documentation";
 
         /// <summary> Initializes a new instance of <see cref="KBSearchResultType"/>. </summary>
+        /// <param name="value"> The value. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
         public KBSearchResultType(string value)
         {
-            _value = value ?? throw new ArgumentNullException(nameof(value));
-        }
+            Argument.AssertNotNull(value, nameof(value));
 
-        private const string CommunityValue = "Community";
-        private const string DocumentationValue = "Documentation";
+            _value = value;
+        }
 
-        /// <summary> Community. </summary>
+        /// <summary> Gets the Community. </summary>
         public static KBSearchResultType Community { get; } = new KBSearchResultType(CommunityValue);
-        /// <summary> Documentation. </summary>
+
+        /// <summary> Gets the Documentation. </summary>
         public static KBSearchResultType Documentation { get; } = new KBSearchResultType(DocumentationValue);
+
         /// <summary> Determines if two <see cref="KBSearchResultType"/> values are the same. </summary>
+        /// <param name="left"> The left value to compare. </param>
+        /// <param name="right"> The right value to compare. </param>
         public static bool operator ==(KBSearchResultType left, KBSearchResultType right) => left.Equals(right);
+
         /// <summary> Determines if two <see cref="KBSearchResultType"/> values are not the same. </summary>
+        /// <param name="left"> The left value to compare. </param>
+        /// <param name="right"> The right value to compare. </param>
         public static bool operator !=(KBSearchResultType left, KBSearchResultType right) => !left.Equals(right);
-        /// <summary> Converts a <see cref="string"/> to a <see cref="KBSearchResultType"/>. </summary>
+
+        /// <summary> Converts a string to a <see cref="KBSearchResultType"/>. </summary>
+        /// <param name="value"> The value. </param>
         public static implicit operator KBSearchResultType(string value) => new KBSearchResultType(value);
 
-        /// <inheritdoc />
+        /// <summary> Converts a string to a <see cref="KBSearchResultType"/>. </summary>
+        /// <param name="value"> The value. </param>
+        public static implicit operator KBSearchResultType?(string value) => value == null ? null : new KBSearchResultType(value);
+
+        /// <inheritdoc/>
         [EditorBrowsable(EditorBrowsableState.Never)]
         public override bool Equals(object obj) => obj is KBSearchResultType other && Equals(other);
-        /// <inheritdoc />
+
+        /// <inheritdoc/>
         public bool Equals(KBSearchResultType other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
 
-        /// <inheritdoc />
+        /// <inheritdoc/>
         [EditorBrowsable(EditorBrowsableState.Never)]
         public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
-        /// <inheritdoc />
+
+        /// <inheritdoc/>
         public override string ToString() => _value;
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/KBWebResult.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/KBWebResult.Serialization.cs
index 17cf0c16ed70..513ba53a2a18 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/KBWebResult.Serialization.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/KBWebResult.Serialization.cs
@@ -9,14 +9,15 @@
 using System.ClientModel.Primitives;
 using System.Collections.Generic;
 using System.Text.Json;
-using Azure.Core;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
-    public partial class KBWebResult : IUtf8JsonSerializable, IJsonModel<KBWebResult>
+    /// <summary> AzureKB web result. </summary>
+    public partial class KBWebResult : IJsonModel<KBWebResult>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<KBWebResult>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
+        /// <param name="writer"> The JSON writer. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
         void IJsonModel<KBWebResult>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
@@ -28,12 +29,11 @@ void IJsonModel<KBWebResult>.Write(Utf8JsonWriter writer, ModelReaderWriterOptio
         /// <param name="options"> The client options for reading and writing models. </param>
         protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<KBWebResult>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<KBWebResult>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(KBWebResult)} does not support writing '{format}' format.");
             }
-
             if (Optional.IsDefined(ReplacementKey))
             {
                 writer.WritePropertyName("replacementKey"u8);
@@ -43,21 +43,21 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             {
                 writer.WritePropertyName("searchResults"u8);
                 writer.WriteStartArray();
-                foreach (var item in SearchResults)
+                foreach (KBSearchResult item in SearchResults)
                 {
                     writer.WriteObjectValue(item, options);
                 }
                 writer.WriteEndArray();
             }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            if (options.Format != "W" && _additionalBinaryDataProperties != null)
             {
-                foreach (var item in _serializedAdditionalRawData)
+                foreach (var item in _additionalBinaryDataProperties)
                 {
                     writer.WritePropertyName(item.Key);
 #if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
+                    writer.WriteRawValue(item.Value);
 #else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value, ModelSerializationExtensions.JsonDocumentOptions))
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
                     {
                         JsonSerializer.Serialize(writer, document.RootElement);
                     }
@@ -66,45 +66,49 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             }
         }
 
-        KBWebResult IJsonModel<KBWebResult>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        KBWebResult IJsonModel<KBWebResult>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options);
+
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual KBWebResult JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<KBWebResult>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<KBWebResult>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(KBWebResult)} does not support reading '{format}' format.");
             }
-
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
             return DeserializeKBWebResult(document.RootElement, options);
         }
 
-        internal static KBWebResult DeserializeKBWebResult(JsonElement element, ModelReaderWriterOptions options = null)
+        /// <param name="element"> The JSON element to deserialize. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        internal static KBWebResult DeserializeKBWebResult(JsonElement element, ModelReaderWriterOptions options)
         {
-            options ??= ModelSerializationExtensions.WireOptions;
-
             if (element.ValueKind == JsonValueKind.Null)
             {
                 return null;
             }
             string replacementKey = default;
-            IReadOnlyList<KBSearchResult> searchResults = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
+            IList<KBSearchResult> searchResults = default;
+            IDictionary<string, BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            foreach (var prop in element.EnumerateObject())
             {
-                if (property.NameEquals("replacementKey"u8))
+                if (prop.NameEquals("replacementKey"u8))
                 {
-                    replacementKey = property.Value.GetString();
+                    replacementKey = prop.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("searchResults"u8))
+                if (prop.NameEquals("searchResults"u8))
                 {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
                     List<KBSearchResult> array = new List<KBSearchResult>();
-                    foreach (var item in property.Value.EnumerateArray())
+                    foreach (var item in prop.Value.EnumerateArray())
                     {
                         array.Add(KBSearchResult.DeserializeKBSearchResult(item, options));
                     }
@@ -113,17 +117,19 @@ internal static KBWebResult DeserializeKBWebResult(JsonElement element, ModelRea
                 }
                 if (options.Format != "W")
                 {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                    additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText()));
                 }
             }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new KBWebResult(replacementKey, searchResults ?? new ChangeTrackingList<KBSearchResult>(), serializedAdditionalRawData);
+            return new KBWebResult(replacementKey, searchResults ?? new ChangeTrackingList<KBSearchResult>(), additionalBinaryDataProperties);
         }
 
-        BinaryData IPersistableModel<KBWebResult>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<KBWebResult>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="options"> The client options for reading and writing models. </param>
+        BinaryData IPersistableModel<KBWebResult>.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
 
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<KBWebResult>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
@@ -133,15 +139,20 @@ BinaryData IPersistableModel<KBWebResult>.Write(ModelReaderWriterOptions options
             }
         }
 
-        KBWebResult IPersistableModel<KBWebResult>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<KBWebResult>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        KBWebResult IPersistableModel<KBWebResult>.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options);
 
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual KBWebResult PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<KBWebResult>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
+                    using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
                     {
-                        using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
                         return DeserializeKBWebResult(document.RootElement, options);
                     }
                 default:
@@ -149,6 +160,7 @@ KBWebResult IPersistableModel<KBWebResult>.Create(BinaryData data, ModelReaderWr
             }
         }
 
+        /// <param name="options"> The client options for reading and writing models. </param>
         string IPersistableModel<KBWebResult>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/KBWebResult.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/KBWebResult.cs
index 92d0f7225d4a..c8231ffeea65 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/KBWebResult.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/KBWebResult.cs
@@ -7,43 +7,15 @@
 
 using System;
 using System.Collections.Generic;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
     /// <summary> AzureKB web result. </summary>
     public partial class KBWebResult
     {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+        /// <summary> Keeps track of any properties unknown to the library. </summary>
+        private protected readonly IDictionary<string, BinaryData> _additionalBinaryDataProperties;
 
         /// <summary> Initializes a new instance of <see cref="KBWebResult"/>. </summary>
         internal KBWebResult()
@@ -54,17 +26,18 @@ internal KBWebResult()
         /// <summary> Initializes a new instance of <see cref="KBWebResult"/>. </summary>
         /// <param name="replacementKey"> Place holder used in HTML Content replace control with the content. </param>
         /// <param name="searchResults"> AzureKB search results. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal KBWebResult(string replacementKey, IReadOnlyList<KBSearchResult> searchResults, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        /// <param name="additionalBinaryDataProperties"> Keeps track of any properties unknown to the library. </param>
+        internal KBWebResult(string replacementKey, IList<KBSearchResult> searchResults, IDictionary<string, BinaryData> additionalBinaryDataProperties)
         {
             ReplacementKey = replacementKey;
             SearchResults = searchResults;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
+            _additionalBinaryDataProperties = additionalBinaryDataProperties;
         }
 
         /// <summary> Place holder used in HTML Content replace control with the content. </summary>
         public string ReplacementKey { get; }
+
         /// <summary> AzureKB search results. </summary>
-        public IReadOnlyList<KBSearchResult> SearchResults { get; }
+        public IList<KBSearchResult> SearchResults { get; }
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/MetricsBasedChart.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/MetricsBasedChart.Serialization.cs
index 99830e928879..2d28d47da590 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/MetricsBasedChart.Serialization.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/MetricsBasedChart.Serialization.cs
@@ -9,14 +9,15 @@
 using System.ClientModel.Primitives;
 using System.Collections.Generic;
 using System.Text.Json;
-using Azure.Core;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
-    public partial class MetricsBasedChart : IUtf8JsonSerializable, IJsonModel<MetricsBasedChart>
+    /// <summary> Solutions metrics based chart. </summary>
+    public partial class MetricsBasedChart : IJsonModel<MetricsBasedChart>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<MetricsBasedChart>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
+        /// <param name="writer"> The JSON writer. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
         void IJsonModel<MetricsBasedChart>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
@@ -28,12 +29,11 @@ void IJsonModel<MetricsBasedChart>.Write(Utf8JsonWriter writer, ModelReaderWrite
         /// <param name="options"> The client options for reading and writing models. </param>
         protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<MetricsBasedChart>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<MetricsBasedChart>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(MetricsBasedChart)} does not support writing '{format}' format.");
             }
-
             if (Optional.IsDefined(Name))
             {
                 writer.WritePropertyName("name"u8);
@@ -64,15 +64,15 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
                 writer.WritePropertyName("replacementKey"u8);
                 writer.WriteStringValue(ReplacementKey);
             }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            if (options.Format != "W" && _additionalBinaryDataProperties != null)
             {
-                foreach (var item in _serializedAdditionalRawData)
+                foreach (var item in _additionalBinaryDataProperties)
                 {
                     writer.WritePropertyName(item.Key);
 #if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
+                    writer.WriteRawValue(item.Value);
 #else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value, ModelSerializationExtensions.JsonDocumentOptions))
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
                     {
                         JsonSerializer.Serialize(writer, document.RootElement);
                     }
@@ -81,22 +81,27 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             }
         }
 
-        MetricsBasedChart IJsonModel<MetricsBasedChart>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        MetricsBasedChart IJsonModel<MetricsBasedChart>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options);
+
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual MetricsBasedChart JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<MetricsBasedChart>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<MetricsBasedChart>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(MetricsBasedChart)} does not support reading '{format}' format.");
             }
-
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
             return DeserializeMetricsBasedChart(document.RootElement, options);
         }
 
-        internal static MetricsBasedChart DeserializeMetricsBasedChart(JsonElement element, ModelReaderWriterOptions options = null)
+        /// <param name="element"> The JSON element to deserialize. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        internal static MetricsBasedChart DeserializeMetricsBasedChart(JsonElement element, ModelReaderWriterOptions options)
         {
-            options ??= ModelSerializationExtensions.WireOptions;
-
             if (element.ValueKind == JsonValueKind.Null)
             {
                 return null;
@@ -107,58 +112,56 @@ internal static MetricsBasedChart DeserializeMetricsBasedChart(JsonElement eleme
             string title = default;
             ChartFilterGroup filterGroup = default;
             string replacementKey = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
+            IDictionary<string, BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            foreach (var prop in element.EnumerateObject())
             {
-                if (property.NameEquals("name"u8))
+                if (prop.NameEquals("name"u8))
                 {
-                    name = property.Value.GetString();
+                    name = prop.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("aggregationType"u8))
+                if (prop.NameEquals("aggregationType"u8))
                 {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
-                    aggregationType = new ChartAggregationType(property.Value.GetString());
+                    aggregationType = new ChartAggregationType(prop.Value.GetString());
                     continue;
                 }
-                if (property.NameEquals("timeSpanDuration"u8))
+                if (prop.NameEquals("timeSpanDuration"u8))
                 {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
-                    timeSpanDuration = property.Value.GetTimeSpan("P");
+                    timeSpanDuration = prop.Value.GetTimeSpan("P");
                     continue;
                 }
-                if (property.NameEquals("title"u8))
+                if (prop.NameEquals("title"u8))
                 {
-                    title = property.Value.GetString();
+                    title = prop.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("filterGroup"u8))
+                if (prop.NameEquals("filterGroup"u8))
                 {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
-                    filterGroup = ChartFilterGroup.DeserializeChartFilterGroup(property.Value, options);
+                    filterGroup = ChartFilterGroup.DeserializeChartFilterGroup(prop.Value, options);
                     continue;
                 }
-                if (property.NameEquals("replacementKey"u8))
+                if (prop.NameEquals("replacementKey"u8))
                 {
-                    replacementKey = property.Value.GetString();
+                    replacementKey = prop.Value.GetString();
                     continue;
                 }
                 if (options.Format != "W")
                 {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                    additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText()));
                 }
             }
-            serializedAdditionalRawData = rawDataDictionary;
             return new MetricsBasedChart(
                 name,
                 aggregationType,
@@ -166,13 +169,16 @@ internal static MetricsBasedChart DeserializeMetricsBasedChart(JsonElement eleme
                 title,
                 filterGroup,
                 replacementKey,
-                serializedAdditionalRawData);
+                additionalBinaryDataProperties);
         }
 
-        BinaryData IPersistableModel<MetricsBasedChart>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MetricsBasedChart>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="options"> The client options for reading and writing models. </param>
+        BinaryData IPersistableModel<MetricsBasedChart>.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
 
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<MetricsBasedChart>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
@@ -182,15 +188,20 @@ BinaryData IPersistableModel<MetricsBasedChart>.Write(ModelReaderWriterOptions o
             }
         }
 
-        MetricsBasedChart IPersistableModel<MetricsBasedChart>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<MetricsBasedChart>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        MetricsBasedChart IPersistableModel<MetricsBasedChart>.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options);
 
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual MetricsBasedChart PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<MetricsBasedChart>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
+                    using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
                     {
-                        using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
                         return DeserializeMetricsBasedChart(document.RootElement, options);
                     }
                 default:
@@ -198,6 +209,7 @@ MetricsBasedChart IPersistableModel<MetricsBasedChart>.Create(BinaryData data, M
             }
         }
 
+        /// <param name="options"> The client options for reading and writing models. </param>
         string IPersistableModel<MetricsBasedChart>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/MetricsBasedChart.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/MetricsBasedChart.cs
index 2c947d3947cf..c7be1a6e5c12 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/MetricsBasedChart.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/MetricsBasedChart.cs
@@ -13,37 +13,8 @@ namespace Azure.ResourceManager.SelfHelp.Models
     /// <summary> Solutions metrics based chart. </summary>
     public partial class MetricsBasedChart
     {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+        /// <summary> Keeps track of any properties unknown to the library. </summary>
+        private protected readonly IDictionary<string, BinaryData> _additionalBinaryDataProperties;
 
         /// <summary> Initializes a new instance of <see cref="MetricsBasedChart"/>. </summary>
         internal MetricsBasedChart()
@@ -57,8 +28,8 @@ internal MetricsBasedChart()
         /// <param name="title"> Chart title. </param>
         /// <param name="filterGroup"> Filter group. </param>
         /// <param name="replacementKey"> Place holder used in HTML Content replace control with the content. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal MetricsBasedChart(string name, ChartAggregationType? aggregationType, TimeSpan? timeSpanDuration, string title, ChartFilterGroup filterGroup, string replacementKey, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        /// <param name="additionalBinaryDataProperties"> Keeps track of any properties unknown to the library. </param>
+        internal MetricsBasedChart(string name, ChartAggregationType? aggregationType, TimeSpan? timeSpanDuration, string title, ChartFilterGroup filterGroup, string replacementKey, IDictionary<string, BinaryData> additionalBinaryDataProperties)
         {
             Name = name;
             AggregationType = aggregationType;
@@ -66,26 +37,34 @@ internal MetricsBasedChart(string name, ChartAggregationType? aggregationType, T
             Title = title;
             FilterGroup = filterGroup;
             ReplacementKey = replacementKey;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
+            _additionalBinaryDataProperties = additionalBinaryDataProperties;
         }
 
         /// <summary> Chart name. </summary>
         public string Name { get; }
+
         /// <summary> Allowed values are Sum, Avg, Count, Min, Max. Default is Sum. </summary>
         public ChartAggregationType? AggregationType { get; }
+
         /// <summary> Time span duration. </summary>
         public TimeSpan? TimeSpanDuration { get; }
+
         /// <summary> Chart title. </summary>
         public string Title { get; }
+
         /// <summary> Filter group. </summary>
         internal ChartFilterGroup FilterGroup { get; }
-        /// <summary> List of filters. </summary>
-        public IReadOnlyList<SelfHelpFilter> Filter
-        {
-            get => FilterGroup?.Filter;
-        }
 
         /// <summary> Place holder used in HTML Content replace control with the content. </summary>
         public string ReplacementKey { get; }
+
+        /// <summary> List of filters. </summary>
+        public IList<SelfHelpFilter> Filter
+        {
+            get
+            {
+                return FilterGroup.Filter;
+            }
+        }
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/ReplacementMapsResult.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/ReplacementMapsResult.Serialization.cs
index 5e4100ffd133..2f2ce7255a11 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/ReplacementMapsResult.Serialization.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/ReplacementMapsResult.Serialization.cs
@@ -9,14 +9,15 @@
 using System.ClientModel.Primitives;
 using System.Collections.Generic;
 using System.Text.Json;
-using Azure.Core;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
-    public partial class ReplacementMapsResult : IUtf8JsonSerializable, IJsonModel<ReplacementMapsResult>
+    /// <summary> Solution replacement maps. </summary>
+    public partial class ReplacementMapsResult : IJsonModel<ReplacementMapsResult>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ReplacementMapsResult>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
+        /// <param name="writer"> The JSON writer. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
         void IJsonModel<ReplacementMapsResult>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
@@ -28,17 +29,16 @@ void IJsonModel<ReplacementMapsResult>.Write(Utf8JsonWriter writer, ModelReaderW
         /// <param name="options"> The client options for reading and writing models. </param>
         protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<ReplacementMapsResult>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<ReplacementMapsResult>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(ReplacementMapsResult)} does not support writing '{format}' format.");
             }
-
             if (Optional.IsCollectionDefined(WebResults))
             {
                 writer.WritePropertyName("webResults"u8);
                 writer.WriteStartArray();
-                foreach (var item in WebResults)
+                foreach (KBWebResult item in WebResults)
                 {
                     writer.WriteObjectValue(item, options);
                 }
@@ -48,7 +48,7 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             {
                 writer.WritePropertyName("videos"u8);
                 writer.WriteStartArray();
-                foreach (var item in Videos)
+                foreach (SelfHelpVideo item in Videos)
                 {
                     writer.WriteObjectValue(item, options);
                 }
@@ -58,21 +58,21 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             {
                 writer.WritePropertyName("videoGroups"u8);
                 writer.WriteStartArray();
-                foreach (var item in VideoGroups)
+                foreach (VideoGroupDetail item in VideoGroups)
                 {
                     writer.WriteObjectValue(item, options);
                 }
                 writer.WriteEndArray();
             }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            if (options.Format != "W" && _additionalBinaryDataProperties != null)
             {
-                foreach (var item in _serializedAdditionalRawData)
+                foreach (var item in _additionalBinaryDataProperties)
                 {
                     writer.WritePropertyName(item.Key);
 #if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
+                    writer.WriteRawValue(item.Value);
 #else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value, ModelSerializationExtensions.JsonDocumentOptions))
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
                     {
                         JsonSerializer.Serialize(writer, document.RootElement);
                     }
@@ -81,69 +81,73 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             }
         }
 
-        ReplacementMapsResult IJsonModel<ReplacementMapsResult>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        ReplacementMapsResult IJsonModel<ReplacementMapsResult>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options);
+
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual ReplacementMapsResult JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<ReplacementMapsResult>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<ReplacementMapsResult>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(ReplacementMapsResult)} does not support reading '{format}' format.");
             }
-
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
             return DeserializeReplacementMapsResult(document.RootElement, options);
         }
 
-        internal static ReplacementMapsResult DeserializeReplacementMapsResult(JsonElement element, ModelReaderWriterOptions options = null)
+        /// <param name="element"> The JSON element to deserialize. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        internal static ReplacementMapsResult DeserializeReplacementMapsResult(JsonElement element, ModelReaderWriterOptions options)
         {
-            options ??= ModelSerializationExtensions.WireOptions;
-
             if (element.ValueKind == JsonValueKind.Null)
             {
                 return null;
             }
-            IReadOnlyList<KBWebResult> webResults = default;
-            IReadOnlyList<SelfHelpVideo> videos = default;
-            IReadOnlyList<VideoGroupDetail> videoGroups = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
+            IList<KBWebResult> webResults = default;
+            IList<SelfHelpVideo> videos = default;
+            IList<VideoGroupDetail> videoGroups = default;
+            IDictionary<string, BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            foreach (var prop in element.EnumerateObject())
             {
-                if (property.NameEquals("webResults"u8))
+                if (prop.NameEquals("webResults"u8))
                 {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
                     List<KBWebResult> array = new List<KBWebResult>();
-                    foreach (var item in property.Value.EnumerateArray())
+                    foreach (var item in prop.Value.EnumerateArray())
                     {
                         array.Add(KBWebResult.DeserializeKBWebResult(item, options));
                     }
                     webResults = array;
                     continue;
                 }
-                if (property.NameEquals("videos"u8))
+                if (prop.NameEquals("videos"u8))
                 {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
                     List<SelfHelpVideo> array = new List<SelfHelpVideo>();
-                    foreach (var item in property.Value.EnumerateArray())
+                    foreach (var item in prop.Value.EnumerateArray())
                     {
                         array.Add(SelfHelpVideo.DeserializeSelfHelpVideo(item, options));
                     }
                     videos = array;
                     continue;
                 }
-                if (property.NameEquals("videoGroups"u8))
+                if (prop.NameEquals("videoGroups"u8))
                 {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
                     List<VideoGroupDetail> array = new List<VideoGroupDetail>();
-                    foreach (var item in property.Value.EnumerateArray())
+                    foreach (var item in prop.Value.EnumerateArray())
                     {
                         array.Add(VideoGroupDetail.DeserializeVideoGroupDetail(item, options));
                     }
@@ -152,17 +156,19 @@ internal static ReplacementMapsResult DeserializeReplacementMapsResult(JsonEleme
                 }
                 if (options.Format != "W")
                 {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                    additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText()));
                 }
             }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ReplacementMapsResult(webResults ?? new ChangeTrackingList<KBWebResult>(), videos ?? new ChangeTrackingList<SelfHelpVideo>(), videoGroups ?? new ChangeTrackingList<VideoGroupDetail>(), serializedAdditionalRawData);
+            return new ReplacementMapsResult(webResults ?? new ChangeTrackingList<KBWebResult>(), videos ?? new ChangeTrackingList<SelfHelpVideo>(), videoGroups ?? new ChangeTrackingList<VideoGroupDetail>(), additionalBinaryDataProperties);
         }
 
-        BinaryData IPersistableModel<ReplacementMapsResult>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ReplacementMapsResult>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="options"> The client options for reading and writing models. </param>
+        BinaryData IPersistableModel<ReplacementMapsResult>.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
 
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<ReplacementMapsResult>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
@@ -172,15 +178,20 @@ BinaryData IPersistableModel<ReplacementMapsResult>.Write(ModelReaderWriterOptio
             }
         }
 
-        ReplacementMapsResult IPersistableModel<ReplacementMapsResult>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ReplacementMapsResult>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        ReplacementMapsResult IPersistableModel<ReplacementMapsResult>.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options);
 
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual ReplacementMapsResult PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<ReplacementMapsResult>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
+                    using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
                     {
-                        using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
                         return DeserializeReplacementMapsResult(document.RootElement, options);
                     }
                 default:
@@ -188,6 +199,7 @@ ReplacementMapsResult IPersistableModel<ReplacementMapsResult>.Create(BinaryData
             }
         }
 
+        /// <param name="options"> The client options for reading and writing models. </param>
         string IPersistableModel<ReplacementMapsResult>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/ReplacementMapsResult.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/ReplacementMapsResult.cs
index 495ee2580a4a..2e365bcf5f92 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/ReplacementMapsResult.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/ReplacementMapsResult.cs
@@ -7,43 +7,15 @@
 
 using System;
 using System.Collections.Generic;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
     /// <summary> Solution replacement maps. </summary>
     public partial class ReplacementMapsResult
     {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+        /// <summary> Keeps track of any properties unknown to the library. </summary>
+        private protected readonly IDictionary<string, BinaryData> _additionalBinaryDataProperties;
 
         /// <summary> Initializes a new instance of <see cref="ReplacementMapsResult"/>. </summary>
         internal ReplacementMapsResult()
@@ -57,20 +29,22 @@ internal ReplacementMapsResult()
         /// <param name="webResults"> Solution AzureKB results. </param>
         /// <param name="videos"> Video solutions, which have the power to engage the customer by stimulating their senses. </param>
         /// <param name="videoGroups"> Group of Videos. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ReplacementMapsResult(IReadOnlyList<KBWebResult> webResults, IReadOnlyList<SelfHelpVideo> videos, IReadOnlyList<VideoGroupDetail> videoGroups, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        /// <param name="additionalBinaryDataProperties"> Keeps track of any properties unknown to the library. </param>
+        internal ReplacementMapsResult(IList<KBWebResult> webResults, IList<SelfHelpVideo> videos, IList<VideoGroupDetail> videoGroups, IDictionary<string, BinaryData> additionalBinaryDataProperties)
         {
             WebResults = webResults;
             Videos = videos;
             VideoGroups = videoGroups;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
+            _additionalBinaryDataProperties = additionalBinaryDataProperties;
         }
 
         /// <summary> Solution AzureKB results. </summary>
-        public IReadOnlyList<KBWebResult> WebResults { get; }
+        public IList<KBWebResult> WebResults { get; }
+
         /// <summary> Video solutions, which have the power to engage the customer by stimulating their senses. </summary>
-        public IReadOnlyList<SelfHelpVideo> Videos { get; }
+        public IList<SelfHelpVideo> Videos { get; }
+
         /// <summary> Group of Videos. </summary>
-        public IReadOnlyList<VideoGroupDetail> VideoGroups { get; }
+        public IList<VideoGroupDetail> VideoGroups { get; }
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/ResponseConfig.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/ResponseConfig.Serialization.cs
index bdf7a932e92e..5aa21aaa0cf4 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/ResponseConfig.Serialization.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/ResponseConfig.Serialization.cs
@@ -9,14 +9,15 @@
 using System.ClientModel.Primitives;
 using System.Collections.Generic;
 using System.Text.Json;
-using Azure.Core;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
-    public partial class ResponseConfig : IUtf8JsonSerializable, IJsonModel<ResponseConfig>
+    /// <summary> The status of the resource. </summary>
+    public partial class ResponseConfig : IJsonModel<ResponseConfig>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ResponseConfig>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
+        /// <param name="writer"> The JSON writer. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
         void IJsonModel<ResponseConfig>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
@@ -28,12 +29,11 @@ void IJsonModel<ResponseConfig>.Write(Utf8JsonWriter writer, ModelReaderWriterOp
         /// <param name="options"> The client options for reading and writing models. </param>
         protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<ResponseConfig>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<ResponseConfig>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(ResponseConfig)} does not support writing '{format}' format.");
             }
-
             if (Optional.IsDefined(Key))
             {
                 writer.WritePropertyName("key"u8);
@@ -44,15 +44,15 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
                 writer.WritePropertyName("value"u8);
                 writer.WriteStringValue(Value);
             }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            if (options.Format != "W" && _additionalBinaryDataProperties != null)
             {
-                foreach (var item in _serializedAdditionalRawData)
+                foreach (var item in _additionalBinaryDataProperties)
                 {
                     writer.WritePropertyName(item.Key);
 #if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
+                    writer.WriteRawValue(item.Value);
 #else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value, ModelSerializationExtensions.JsonDocumentOptions))
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
                     {
                         JsonSerializer.Serialize(writer, document.RootElement);
                     }
@@ -61,55 +61,61 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             }
         }
 
-        ResponseConfig IJsonModel<ResponseConfig>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        ResponseConfig IJsonModel<ResponseConfig>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options);
+
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual ResponseConfig JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<ResponseConfig>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<ResponseConfig>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(ResponseConfig)} does not support reading '{format}' format.");
             }
-
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
             return DeserializeResponseConfig(document.RootElement, options);
         }
 
-        internal static ResponseConfig DeserializeResponseConfig(JsonElement element, ModelReaderWriterOptions options = null)
+        /// <param name="element"> The JSON element to deserialize. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        internal static ResponseConfig DeserializeResponseConfig(JsonElement element, ModelReaderWriterOptions options)
         {
-            options ??= ModelSerializationExtensions.WireOptions;
-
             if (element.ValueKind == JsonValueKind.Null)
             {
                 return null;
             }
             string key = default;
             string value = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
+            IDictionary<string, BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            foreach (var prop in element.EnumerateObject())
             {
-                if (property.NameEquals("key"u8))
+                if (prop.NameEquals("key"u8))
                 {
-                    key = property.Value.GetString();
+                    key = prop.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("value"u8))
+                if (prop.NameEquals("value"u8))
                 {
-                    value = property.Value.GetString();
+                    value = prop.Value.GetString();
                     continue;
                 }
                 if (options.Format != "W")
                 {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                    additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText()));
                 }
             }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new ResponseConfig(key, value, serializedAdditionalRawData);
+            return new ResponseConfig(key, value, additionalBinaryDataProperties);
         }
 
-        BinaryData IPersistableModel<ResponseConfig>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResponseConfig>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="options"> The client options for reading and writing models. </param>
+        BinaryData IPersistableModel<ResponseConfig>.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
 
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<ResponseConfig>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
@@ -119,15 +125,20 @@ BinaryData IPersistableModel<ResponseConfig>.Write(ModelReaderWriterOptions opti
             }
         }
 
-        ResponseConfig IPersistableModel<ResponseConfig>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResponseConfig>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        ResponseConfig IPersistableModel<ResponseConfig>.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options);
 
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual ResponseConfig PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<ResponseConfig>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
+                    using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
                     {
-                        using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
                         return DeserializeResponseConfig(document.RootElement, options);
                     }
                 default:
@@ -135,6 +146,7 @@ ResponseConfig IPersistableModel<ResponseConfig>.Create(BinaryData data, ModelRe
             }
         }
 
+        /// <param name="options"> The client options for reading and writing models. </param>
         string IPersistableModel<ResponseConfig>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/ResponseConfig.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/ResponseConfig.cs
index 3ad050325966..462b9e6dca9a 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/ResponseConfig.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/ResponseConfig.cs
@@ -13,37 +13,8 @@ namespace Azure.ResourceManager.SelfHelp.Models
     /// <summary> The status of the resource. </summary>
     public partial class ResponseConfig
     {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+        /// <summary> Keeps track of any properties unknown to the library. </summary>
+        private protected readonly IDictionary<string, BinaryData> _additionalBinaryDataProperties;
 
         /// <summary> Initializes a new instance of <see cref="ResponseConfig"/>. </summary>
         internal ResponseConfig()
@@ -53,16 +24,17 @@ internal ResponseConfig()
         /// <summary> Initializes a new instance of <see cref="ResponseConfig"/>. </summary>
         /// <param name="key"> Unique string. </param>
         /// <param name="value"> Option description. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ResponseConfig(string key, string value, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        /// <param name="additionalBinaryDataProperties"> Keeps track of any properties unknown to the library. </param>
+        internal ResponseConfig(string key, string value, IDictionary<string, BinaryData> additionalBinaryDataProperties)
         {
             Key = key;
             Value = value;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
+            _additionalBinaryDataProperties = additionalBinaryDataProperties;
         }
 
         /// <summary> Unique string. </summary>
         public string Key { get; }
+
         /// <summary> Option description. </summary>
         public string Value { get; }
     }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/ResponseValidationProperties.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/ResponseValidationProperties.Serialization.cs
index 05479eaefab8..b0da7b8f150c 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/ResponseValidationProperties.Serialization.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/ResponseValidationProperties.Serialization.cs
@@ -9,14 +9,15 @@
 using System.ClientModel.Primitives;
 using System.Collections.Generic;
 using System.Text.Json;
-using Azure.Core;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
-    public partial class ResponseValidationProperties : IUtf8JsonSerializable, IJsonModel<ResponseValidationProperties>
+    /// <summary> Troubleshooter step input response validation properties. </summary>
+    public partial class ResponseValidationProperties : IJsonModel<ResponseValidationProperties>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<ResponseValidationProperties>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
+        /// <param name="writer"> The JSON writer. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
         void IJsonModel<ResponseValidationProperties>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
@@ -28,12 +29,11 @@ void IJsonModel<ResponseValidationProperties>.Write(Utf8JsonWriter writer, Model
         /// <param name="options"> The client options for reading and writing models. </param>
         protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<ResponseValidationProperties>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<ResponseValidationProperties>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(ResponseValidationProperties)} does not support writing '{format}' format.");
             }
-
             if (Optional.IsDefined(Regex))
             {
                 writer.WritePropertyName("regex"u8);
@@ -59,15 +59,15 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
                 writer.WritePropertyName("maxLength"u8);
                 writer.WriteNumberValue(MaxLength.Value);
             }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            if (options.Format != "W" && _additionalBinaryDataProperties != null)
             {
-                foreach (var item in _serializedAdditionalRawData)
+                foreach (var item in _additionalBinaryDataProperties)
                 {
                     writer.WritePropertyName(item.Key);
 #if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
+                    writer.WriteRawValue(item.Value);
 #else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value, ModelSerializationExtensions.JsonDocumentOptions))
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
                     {
                         JsonSerializer.Serialize(writer, document.RootElement);
                     }
@@ -76,22 +76,27 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             }
         }
 
-        ResponseValidationProperties IJsonModel<ResponseValidationProperties>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        ResponseValidationProperties IJsonModel<ResponseValidationProperties>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options);
+
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual ResponseValidationProperties JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<ResponseValidationProperties>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<ResponseValidationProperties>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(ResponseValidationProperties)} does not support reading '{format}' format.");
             }
-
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
             return DeserializeResponseValidationProperties(document.RootElement, options);
         }
 
-        internal static ResponseValidationProperties DeserializeResponseValidationProperties(JsonElement element, ModelReaderWriterOptions options = null)
+        /// <param name="element"> The JSON element to deserialize. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        internal static ResponseValidationProperties DeserializeResponseValidationProperties(JsonElement element, ModelReaderWriterOptions options)
         {
-            options ??= ModelSerializationExtensions.WireOptions;
-
             if (element.ValueKind == JsonValueKind.Null)
             {
                 return null;
@@ -101,66 +106,67 @@ internal static ResponseValidationProperties DeserializeResponseValidationProper
             bool? isRequired = default;
             string validationErrorMessage = default;
             long? maxLength = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
+            IDictionary<string, BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            foreach (var prop in element.EnumerateObject())
             {
-                if (property.NameEquals("regex"u8))
+                if (prop.NameEquals("regex"u8))
                 {
-                    regex = property.Value.GetString();
+                    regex = prop.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("validationScope"u8))
+                if (prop.NameEquals("validationScope"u8))
                 {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
-                    validationScope = new TroubleshooterValidationScope(property.Value.GetString());
+                    validationScope = new TroubleshooterValidationScope(prop.Value.GetString());
                     continue;
                 }
-                if (property.NameEquals("isRequired"u8))
+                if (prop.NameEquals("isRequired"u8))
                 {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
-                    isRequired = property.Value.GetBoolean();
+                    isRequired = prop.Value.GetBoolean();
                     continue;
                 }
-                if (property.NameEquals("validationErrorMessage"u8))
+                if (prop.NameEquals("validationErrorMessage"u8))
                 {
-                    validationErrorMessage = property.Value.GetString();
+                    validationErrorMessage = prop.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("maxLength"u8))
+                if (prop.NameEquals("maxLength"u8))
                 {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
-                    maxLength = property.Value.GetInt64();
+                    maxLength = prop.Value.GetInt64();
                     continue;
                 }
                 if (options.Format != "W")
                 {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                    additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText()));
                 }
             }
-            serializedAdditionalRawData = rawDataDictionary;
             return new ResponseValidationProperties(
                 regex,
                 validationScope,
                 isRequired,
                 validationErrorMessage,
                 maxLength,
-                serializedAdditionalRawData);
+                additionalBinaryDataProperties);
         }
 
-        BinaryData IPersistableModel<ResponseValidationProperties>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResponseValidationProperties>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="options"> The client options for reading and writing models. </param>
+        BinaryData IPersistableModel<ResponseValidationProperties>.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
 
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<ResponseValidationProperties>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
@@ -170,15 +176,20 @@ BinaryData IPersistableModel<ResponseValidationProperties>.Write(ModelReaderWrit
             }
         }
 
-        ResponseValidationProperties IPersistableModel<ResponseValidationProperties>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<ResponseValidationProperties>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        ResponseValidationProperties IPersistableModel<ResponseValidationProperties>.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options);
 
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual ResponseValidationProperties PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<ResponseValidationProperties>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
+                    using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
                     {
-                        using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
                         return DeserializeResponseValidationProperties(document.RootElement, options);
                     }
                 default:
@@ -186,6 +197,7 @@ ResponseValidationProperties IPersistableModel<ResponseValidationProperties>.Cre
             }
         }
 
+        /// <param name="options"> The client options for reading and writing models. </param>
         string IPersistableModel<ResponseValidationProperties>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/ResponseValidationProperties.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/ResponseValidationProperties.cs
index a7b7c7a3c2cf..66f6f79dbdcc 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/ResponseValidationProperties.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/ResponseValidationProperties.cs
@@ -13,37 +13,8 @@ namespace Azure.ResourceManager.SelfHelp.Models
     /// <summary> Troubleshooter step input response validation properties. </summary>
     public partial class ResponseValidationProperties
     {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+        /// <summary> Keeps track of any properties unknown to the library. </summary>
+        private protected readonly IDictionary<string, BinaryData> _additionalBinaryDataProperties;
 
         /// <summary> Initializes a new instance of <see cref="ResponseValidationProperties"/>. </summary>
         internal ResponseValidationProperties()
@@ -56,25 +27,29 @@ internal ResponseValidationProperties()
         /// <param name="isRequired"> Default True. </param>
         /// <param name="validationErrorMessage"> Validation Error Message. </param>
         /// <param name="maxLength"> Max text input (open Ended Text). </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal ResponseValidationProperties(string regex, TroubleshooterValidationScope? validationScope, bool? isRequired, string validationErrorMessage, long? maxLength, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        /// <param name="additionalBinaryDataProperties"> Keeps track of any properties unknown to the library. </param>
+        internal ResponseValidationProperties(string regex, TroubleshooterValidationScope? validationScope, bool? isRequired, string validationErrorMessage, long? maxLength, IDictionary<string, BinaryData> additionalBinaryDataProperties)
         {
             Regex = regex;
             ValidationScope = validationScope;
             IsRequired = isRequired;
             ValidationErrorMessage = validationErrorMessage;
             MaxLength = maxLength;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
+            _additionalBinaryDataProperties = additionalBinaryDataProperties;
         }
 
         /// <summary> Regex used for the input validation. </summary>
         public string Regex { get; }
+
         /// <summary> Validation scope. </summary>
         public TroubleshooterValidationScope? ValidationScope { get; }
+
         /// <summary> Default True. </summary>
         public bool? IsRequired { get; }
+
         /// <summary> Validation Error Message. </summary>
         public string ValidationErrorMessage { get; }
+
         /// <summary> Max text input (open Ended Text). </summary>
         public long? MaxLength { get; }
     }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/RestartTroubleshooterResult.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/RestartTroubleshooterResult.Serialization.cs
index b8a654c54d37..e38260985a2a 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/RestartTroubleshooterResult.Serialization.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/RestartTroubleshooterResult.Serialization.cs
@@ -9,14 +9,16 @@
 using System.ClientModel.Primitives;
 using System.Collections.Generic;
 using System.Text.Json;
-using Azure.Core;
+using Azure;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
-    public partial class RestartTroubleshooterResult : IUtf8JsonSerializable, IJsonModel<RestartTroubleshooterResult>
+    /// <summary> Troubleshooter restart response. </summary>
+    public partial class RestartTroubleshooterResult : IJsonModel<RestartTroubleshooterResult>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<RestartTroubleshooterResult>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
+        /// <param name="writer"> The JSON writer. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
         void IJsonModel<RestartTroubleshooterResult>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
@@ -28,26 +30,25 @@ void IJsonModel<RestartTroubleshooterResult>.Write(Utf8JsonWriter writer, ModelR
         /// <param name="options"> The client options for reading and writing models. </param>
         protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<RestartTroubleshooterResult>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<RestartTroubleshooterResult>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(RestartTroubleshooterResult)} does not support writing '{format}' format.");
             }
-
             if (options.Format != "W" && Optional.IsDefined(TroubleshooterResourceName))
             {
                 writer.WritePropertyName("troubleshooterResourceName"u8);
                 writer.WriteStringValue(TroubleshooterResourceName);
             }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            if (options.Format != "W" && _additionalBinaryDataProperties != null)
             {
-                foreach (var item in _serializedAdditionalRawData)
+                foreach (var item in _additionalBinaryDataProperties)
                 {
                     writer.WritePropertyName(item.Key);
 #if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
+                    writer.WriteRawValue(item.Value);
 #else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value, ModelSerializationExtensions.JsonDocumentOptions))
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
                     {
                         JsonSerializer.Serialize(writer, document.RootElement);
                     }
@@ -56,49 +57,55 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             }
         }
 
-        RestartTroubleshooterResult IJsonModel<RestartTroubleshooterResult>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        RestartTroubleshooterResult IJsonModel<RestartTroubleshooterResult>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options);
+
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual RestartTroubleshooterResult JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<RestartTroubleshooterResult>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<RestartTroubleshooterResult>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(RestartTroubleshooterResult)} does not support reading '{format}' format.");
             }
-
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
             return DeserializeRestartTroubleshooterResult(document.RootElement, options);
         }
 
-        internal static RestartTroubleshooterResult DeserializeRestartTroubleshooterResult(JsonElement element, ModelReaderWriterOptions options = null)
+        /// <param name="element"> The JSON element to deserialize. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        internal static RestartTroubleshooterResult DeserializeRestartTroubleshooterResult(JsonElement element, ModelReaderWriterOptions options)
         {
-            options ??= ModelSerializationExtensions.WireOptions;
-
             if (element.ValueKind == JsonValueKind.Null)
             {
                 return null;
             }
             string troubleshooterResourceName = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
+            IDictionary<string, BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            foreach (var prop in element.EnumerateObject())
             {
-                if (property.NameEquals("troubleshooterResourceName"u8))
+                if (prop.NameEquals("troubleshooterResourceName"u8))
                 {
-                    troubleshooterResourceName = property.Value.GetString();
+                    troubleshooterResourceName = prop.Value.GetString();
                     continue;
                 }
                 if (options.Format != "W")
                 {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                    additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText()));
                 }
             }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new RestartTroubleshooterResult(troubleshooterResourceName, serializedAdditionalRawData);
+            return new RestartTroubleshooterResult(troubleshooterResourceName, additionalBinaryDataProperties);
         }
 
-        BinaryData IPersistableModel<RestartTroubleshooterResult>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<RestartTroubleshooterResult>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="options"> The client options for reading and writing models. </param>
+        BinaryData IPersistableModel<RestartTroubleshooterResult>.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
 
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<RestartTroubleshooterResult>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
@@ -108,15 +115,20 @@ BinaryData IPersistableModel<RestartTroubleshooterResult>.Write(ModelReaderWrite
             }
         }
 
-        RestartTroubleshooterResult IPersistableModel<RestartTroubleshooterResult>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<RestartTroubleshooterResult>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        RestartTroubleshooterResult IPersistableModel<RestartTroubleshooterResult>.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options);
 
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual RestartTroubleshooterResult PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<RestartTroubleshooterResult>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
+                    using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
                     {
-                        using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
                         return DeserializeRestartTroubleshooterResult(document.RootElement, options);
                     }
                 default:
@@ -124,6 +136,14 @@ RestartTroubleshooterResult IPersistableModel<RestartTroubleshooterResult>.Creat
             }
         }
 
+        /// <param name="options"> The client options for reading and writing models. </param>
         string IPersistableModel<RestartTroubleshooterResult>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <param name="response"> The <see cref="Response"/> to deserialize the <see cref="RestartTroubleshooterResult"/> from. </param>
+        internal static RestartTroubleshooterResult FromResponse(Response response)
+        {
+            using JsonDocument document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions);
+            return DeserializeRestartTroubleshooterResult(document.RootElement, ModelSerializationExtensions.WireOptions);
+        }
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/RestartTroubleshooterResult.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/RestartTroubleshooterResult.cs
index 00e063c91e8b..cf429368ffa8 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/RestartTroubleshooterResult.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/RestartTroubleshooterResult.cs
@@ -13,37 +13,8 @@ namespace Azure.ResourceManager.SelfHelp.Models
     /// <summary> Troubleshooter restart response. </summary>
     public partial class RestartTroubleshooterResult
     {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+        /// <summary> Keeps track of any properties unknown to the library. </summary>
+        private protected readonly IDictionary<string, BinaryData> _additionalBinaryDataProperties;
 
         /// <summary> Initializes a new instance of <see cref="RestartTroubleshooterResult"/>. </summary>
         internal RestartTroubleshooterResult()
@@ -52,11 +23,11 @@ internal RestartTroubleshooterResult()
 
         /// <summary> Initializes a new instance of <see cref="RestartTroubleshooterResult"/>. </summary>
         /// <param name="troubleshooterResourceName"> Updated TroubleshooterResource Name . </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal RestartTroubleshooterResult(string troubleshooterResourceName, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        /// <param name="additionalBinaryDataProperties"> Keeps track of any properties unknown to the library. </param>
+        internal RestartTroubleshooterResult(string troubleshooterResourceName, IDictionary<string, BinaryData> additionalBinaryDataProperties)
         {
             TroubleshooterResourceName = troubleshooterResourceName;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
+            _additionalBinaryDataProperties = additionalBinaryDataProperties;
         }
 
         /// <summary> Updated TroubleshooterResource Name . </summary>
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpConfidence.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpConfidence.cs
index 67357d88f0b9..9b314f335609 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpConfidence.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpConfidence.cs
@@ -7,6 +7,7 @@
 
 using System;
 using System.ComponentModel;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
@@ -14,41 +15,59 @@ namespace Azure.ResourceManager.SelfHelp.Models
     public readonly partial struct SelfHelpConfidence : IEquatable<SelfHelpConfidence>
     {
         private readonly string _value;
+        private const string LowValue = "Low";
+        private const string MediumValue = "Medium";
+        private const string HighValue = "High";
 
         /// <summary> Initializes a new instance of <see cref="SelfHelpConfidence"/>. </summary>
+        /// <param name="value"> The value. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
         public SelfHelpConfidence(string value)
         {
-            _value = value ?? throw new ArgumentNullException(nameof(value));
-        }
+            Argument.AssertNotNull(value, nameof(value));
 
-        private const string LowValue = "Low";
-        private const string MediumValue = "Medium";
-        private const string HighValue = "High";
+            _value = value;
+        }
 
-        /// <summary> Low. </summary>
+        /// <summary> Gets the Low. </summary>
         public static SelfHelpConfidence Low { get; } = new SelfHelpConfidence(LowValue);
-        /// <summary> Medium. </summary>
+
+        /// <summary> Gets the Medium. </summary>
         public static SelfHelpConfidence Medium { get; } = new SelfHelpConfidence(MediumValue);
-        /// <summary> High. </summary>
+
+        /// <summary> Gets the High. </summary>
         public static SelfHelpConfidence High { get; } = new SelfHelpConfidence(HighValue);
+
         /// <summary> Determines if two <see cref="SelfHelpConfidence"/> values are the same. </summary>
+        /// <param name="left"> The left value to compare. </param>
+        /// <param name="right"> The right value to compare. </param>
         public static bool operator ==(SelfHelpConfidence left, SelfHelpConfidence right) => left.Equals(right);
+
         /// <summary> Determines if two <see cref="SelfHelpConfidence"/> values are not the same. </summary>
+        /// <param name="left"> The left value to compare. </param>
+        /// <param name="right"> The right value to compare. </param>
         public static bool operator !=(SelfHelpConfidence left, SelfHelpConfidence right) => !left.Equals(right);
-        /// <summary> Converts a <see cref="string"/> to a <see cref="SelfHelpConfidence"/>. </summary>
+
+        /// <summary> Converts a string to a <see cref="SelfHelpConfidence"/>. </summary>
+        /// <param name="value"> The value. </param>
         public static implicit operator SelfHelpConfidence(string value) => new SelfHelpConfidence(value);
 
-        /// <inheritdoc />
+        /// <summary> Converts a string to a <see cref="SelfHelpConfidence"/>. </summary>
+        /// <param name="value"> The value. </param>
+        public static implicit operator SelfHelpConfidence?(string value) => value == null ? null : new SelfHelpConfidence(value);
+
+        /// <inheritdoc/>
         [EditorBrowsable(EditorBrowsableState.Never)]
         public override bool Equals(object obj) => obj is SelfHelpConfidence other && Equals(other);
-        /// <inheritdoc />
+
+        /// <inheritdoc/>
         public bool Equals(SelfHelpConfidence other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
 
-        /// <inheritdoc />
+        /// <inheritdoc/>
         [EditorBrowsable(EditorBrowsableState.Never)]
         public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
-        /// <inheritdoc />
+
+        /// <inheritdoc/>
         public override string ToString() => _value;
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpDiagnosticInfo.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpDiagnosticInfo.Serialization.cs
index 5fd2f63f087e..c226a0b875d9 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpDiagnosticInfo.Serialization.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpDiagnosticInfo.Serialization.cs
@@ -9,14 +9,15 @@
 using System.ClientModel.Primitives;
 using System.Collections.Generic;
 using System.Text.Json;
-using Azure.Core;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
-    public partial class SelfHelpDiagnosticInfo : IUtf8JsonSerializable, IJsonModel<SelfHelpDiagnosticInfo>
+    /// <summary> Properties returned with in an insight. </summary>
+    public partial class SelfHelpDiagnosticInfo : IJsonModel<SelfHelpDiagnosticInfo>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<SelfHelpDiagnosticInfo>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
+        /// <param name="writer"> The JSON writer. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
         void IJsonModel<SelfHelpDiagnosticInfo>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
@@ -28,12 +29,11 @@ void IJsonModel<SelfHelpDiagnosticInfo>.Write(Utf8JsonWriter writer, ModelReader
         /// <param name="options"> The client options for reading and writing models. </param>
         protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpDiagnosticInfo>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpDiagnosticInfo>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(SelfHelpDiagnosticInfo)} does not support writing '{format}' format.");
             }
-
             if (Optional.IsDefined(SolutionId))
             {
                 writer.WritePropertyName("solutionId"u8);
@@ -48,7 +48,7 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             {
                 writer.WritePropertyName("insights"u8);
                 writer.WriteStartArray();
-                foreach (var item in Insights)
+                foreach (SelfHelpDiagnosticInsight item in Insights)
                 {
                     writer.WriteObjectValue(item, options);
                 }
@@ -59,15 +59,15 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
                 writer.WritePropertyName("error"u8);
                 writer.WriteObjectValue(Error, options);
             }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            if (options.Format != "W" && _additionalBinaryDataProperties != null)
             {
-                foreach (var item in _serializedAdditionalRawData)
+                foreach (var item in _additionalBinaryDataProperties)
                 {
                     writer.WritePropertyName(item.Key);
 #if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
+                    writer.WriteRawValue(item.Value);
 #else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value, ModelSerializationExtensions.JsonDocumentOptions))
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
                     {
                         JsonSerializer.Serialize(writer, document.RootElement);
                     }
@@ -76,22 +76,27 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             }
         }
 
-        SelfHelpDiagnosticInfo IJsonModel<SelfHelpDiagnosticInfo>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        SelfHelpDiagnosticInfo IJsonModel<SelfHelpDiagnosticInfo>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options);
+
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual SelfHelpDiagnosticInfo JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpDiagnosticInfo>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpDiagnosticInfo>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(SelfHelpDiagnosticInfo)} does not support reading '{format}' format.");
             }
-
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
             return DeserializeSelfHelpDiagnosticInfo(document.RootElement, options);
         }
 
-        internal static SelfHelpDiagnosticInfo DeserializeSelfHelpDiagnosticInfo(JsonElement element, ModelReaderWriterOptions options = null)
+        /// <param name="element"> The JSON element to deserialize. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        internal static SelfHelpDiagnosticInfo DeserializeSelfHelpDiagnosticInfo(JsonElement element, ModelReaderWriterOptions options)
         {
-            options ??= ModelSerializationExtensions.WireOptions;
-
             if (element.ValueKind == JsonValueKind.Null)
             {
                 return null;
@@ -100,60 +105,61 @@ internal static SelfHelpDiagnosticInfo DeserializeSelfHelpDiagnosticInfo(JsonEle
             SelfHelpDiagnosticStatus? status = default;
             IReadOnlyList<SelfHelpDiagnosticInsight> insights = default;
             SelfHelpError error = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
+            IDictionary<string, BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            foreach (var prop in element.EnumerateObject())
             {
-                if (property.NameEquals("solutionId"u8))
+                if (prop.NameEquals("solutionId"u8))
                 {
-                    solutionId = property.Value.GetString();
+                    solutionId = prop.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("status"u8))
+                if (prop.NameEquals("status"u8))
                 {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
-                    status = new SelfHelpDiagnosticStatus(property.Value.GetString());
+                    status = new SelfHelpDiagnosticStatus(prop.Value.GetString());
                     continue;
                 }
-                if (property.NameEquals("insights"u8))
+                if (prop.NameEquals("insights"u8))
                 {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
                     List<SelfHelpDiagnosticInsight> array = new List<SelfHelpDiagnosticInsight>();
-                    foreach (var item in property.Value.EnumerateArray())
+                    foreach (var item in prop.Value.EnumerateArray())
                     {
                         array.Add(SelfHelpDiagnosticInsight.DeserializeSelfHelpDiagnosticInsight(item, options));
                     }
                     insights = array;
                     continue;
                 }
-                if (property.NameEquals("error"u8))
+                if (prop.NameEquals("error"u8))
                 {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
-                    error = SelfHelpError.DeserializeSelfHelpError(property.Value, options);
+                    error = SelfHelpError.DeserializeSelfHelpError(prop.Value, options);
                     continue;
                 }
                 if (options.Format != "W")
                 {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                    additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText()));
                 }
             }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new SelfHelpDiagnosticInfo(solutionId, status, insights ?? new ChangeTrackingList<SelfHelpDiagnosticInsight>(), error, serializedAdditionalRawData);
+            return new SelfHelpDiagnosticInfo(solutionId, status, insights ?? new ChangeTrackingList<SelfHelpDiagnosticInsight>(), error, additionalBinaryDataProperties);
         }
 
-        BinaryData IPersistableModel<SelfHelpDiagnosticInfo>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpDiagnosticInfo>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="options"> The client options for reading and writing models. </param>
+        BinaryData IPersistableModel<SelfHelpDiagnosticInfo>.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
 
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpDiagnosticInfo>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
@@ -163,15 +169,20 @@ BinaryData IPersistableModel<SelfHelpDiagnosticInfo>.Write(ModelReaderWriterOpti
             }
         }
 
-        SelfHelpDiagnosticInfo IPersistableModel<SelfHelpDiagnosticInfo>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpDiagnosticInfo>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        SelfHelpDiagnosticInfo IPersistableModel<SelfHelpDiagnosticInfo>.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options);
 
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual SelfHelpDiagnosticInfo PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpDiagnosticInfo>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
+                    using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
                     {
-                        using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
                         return DeserializeSelfHelpDiagnosticInfo(document.RootElement, options);
                     }
                 default:
@@ -179,6 +190,7 @@ SelfHelpDiagnosticInfo IPersistableModel<SelfHelpDiagnosticInfo>.Create(BinaryDa
             }
         }
 
+        /// <param name="options"> The client options for reading and writing models. </param>
         string IPersistableModel<SelfHelpDiagnosticInfo>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpDiagnosticInfo.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpDiagnosticInfo.cs
index 9ab6ba706170..4e6af44ab047 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpDiagnosticInfo.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpDiagnosticInfo.cs
@@ -7,43 +7,15 @@
 
 using System;
 using System.Collections.Generic;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
     /// <summary> Properties returned with in an insight. </summary>
     public partial class SelfHelpDiagnosticInfo
     {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+        /// <summary> Keeps track of any properties unknown to the library. </summary>
+        private protected readonly IDictionary<string, BinaryData> _additionalBinaryDataProperties;
 
         /// <summary> Initializes a new instance of <see cref="SelfHelpDiagnosticInfo"/>. </summary>
         internal SelfHelpDiagnosticInfo()
@@ -56,22 +28,25 @@ internal SelfHelpDiagnosticInfo()
         /// <param name="status"> Denotes the status of the diagnostic resource. </param>
         /// <param name="insights"> The problems (if any) detected by this insight. </param>
         /// <param name="error"> Error definition. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal SelfHelpDiagnosticInfo(string solutionId, SelfHelpDiagnosticStatus? status, IReadOnlyList<SelfHelpDiagnosticInsight> insights, SelfHelpError error, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        /// <param name="additionalBinaryDataProperties"> Keeps track of any properties unknown to the library. </param>
+        internal SelfHelpDiagnosticInfo(string solutionId, SelfHelpDiagnosticStatus? status, IReadOnlyList<SelfHelpDiagnosticInsight> insights, SelfHelpError error, IDictionary<string, BinaryData> additionalBinaryDataProperties)
         {
             SolutionId = solutionId;
             Status = status;
             Insights = insights;
             Error = error;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
+            _additionalBinaryDataProperties = additionalBinaryDataProperties;
         }
 
         /// <summary> Solution Id. </summary>
         public string SolutionId { get; }
+
         /// <summary> Denotes the status of the diagnostic resource. </summary>
         public SelfHelpDiagnosticStatus? Status { get; }
+
         /// <summary> The problems (if any) detected by this insight. </summary>
         public IReadOnlyList<SelfHelpDiagnosticInsight> Insights { get; }
+
         /// <summary> Error definition. </summary>
         public SelfHelpError Error { get; }
     }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpDiagnosticInsight.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpDiagnosticInsight.Serialization.cs
index 1fab3a48f477..ed0b0d237d2b 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpDiagnosticInsight.Serialization.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpDiagnosticInsight.Serialization.cs
@@ -9,14 +9,15 @@
 using System.ClientModel.Primitives;
 using System.Collections.Generic;
 using System.Text.Json;
-using Azure.Core;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
-    public partial class SelfHelpDiagnosticInsight : IUtf8JsonSerializable, IJsonModel<SelfHelpDiagnosticInsight>
+    /// <summary> Detailed insights(s) obtained via the invocation of an insight diagnostic. </summary>
+    public partial class SelfHelpDiagnosticInsight : IJsonModel<SelfHelpDiagnosticInsight>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<SelfHelpDiagnosticInsight>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
+        /// <param name="writer"> The JSON writer. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
         void IJsonModel<SelfHelpDiagnosticInsight>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
@@ -28,12 +29,11 @@ void IJsonModel<SelfHelpDiagnosticInsight>.Write(Utf8JsonWriter writer, ModelRea
         /// <param name="options"> The client options for reading and writing models. </param>
         protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpDiagnosticInsight>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpDiagnosticInsight>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(SelfHelpDiagnosticInsight)} does not support writing '{format}' format.");
             }
-
             if (Optional.IsDefined(Id))
             {
                 writer.WritePropertyName("id"u8);
@@ -54,15 +54,15 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
                 writer.WritePropertyName("importanceLevel"u8);
                 writer.WriteStringValue(InsightImportanceLevel.Value.ToString());
             }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            if (options.Format != "W" && _additionalBinaryDataProperties != null)
             {
-                foreach (var item in _serializedAdditionalRawData)
+                foreach (var item in _additionalBinaryDataProperties)
                 {
                     writer.WritePropertyName(item.Key);
 #if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
+                    writer.WriteRawValue(item.Value);
 #else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value, ModelSerializationExtensions.JsonDocumentOptions))
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
                     {
                         JsonSerializer.Serialize(writer, document.RootElement);
                     }
@@ -71,22 +71,27 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             }
         }
 
-        SelfHelpDiagnosticInsight IJsonModel<SelfHelpDiagnosticInsight>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        SelfHelpDiagnosticInsight IJsonModel<SelfHelpDiagnosticInsight>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options);
+
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual SelfHelpDiagnosticInsight JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpDiagnosticInsight>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpDiagnosticInsight>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(SelfHelpDiagnosticInsight)} does not support reading '{format}' format.");
             }
-
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
             return DeserializeSelfHelpDiagnosticInsight(document.RootElement, options);
         }
 
-        internal static SelfHelpDiagnosticInsight DeserializeSelfHelpDiagnosticInsight(JsonElement element, ModelReaderWriterOptions options = null)
+        /// <param name="element"> The JSON element to deserialize. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        internal static SelfHelpDiagnosticInsight DeserializeSelfHelpDiagnosticInsight(JsonElement element, ModelReaderWriterOptions options)
         {
-            options ??= ModelSerializationExtensions.WireOptions;
-
             if (element.ValueKind == JsonValueKind.Null)
             {
                 return null;
@@ -94,48 +99,49 @@ internal static SelfHelpDiagnosticInsight DeserializeSelfHelpDiagnosticInsight(J
             string id = default;
             string title = default;
             string results = default;
-            SelfHelpImportanceLevel? importanceLevel = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
+            SelfHelpImportanceLevel? insightImportanceLevel = default;
+            IDictionary<string, BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            foreach (var prop in element.EnumerateObject())
             {
-                if (property.NameEquals("id"u8))
+                if (prop.NameEquals("id"u8))
                 {
-                    id = property.Value.GetString();
+                    id = prop.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("title"u8))
+                if (prop.NameEquals("title"u8))
                 {
-                    title = property.Value.GetString();
+                    title = prop.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("results"u8))
+                if (prop.NameEquals("results"u8))
                 {
-                    results = property.Value.GetString();
+                    results = prop.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("importanceLevel"u8))
+                if (prop.NameEquals("importanceLevel"u8))
                 {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
-                    importanceLevel = new SelfHelpImportanceLevel(property.Value.GetString());
+                    insightImportanceLevel = new SelfHelpImportanceLevel(prop.Value.GetString());
                     continue;
                 }
                 if (options.Format != "W")
                 {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                    additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText()));
                 }
             }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new SelfHelpDiagnosticInsight(id, title, results, importanceLevel, serializedAdditionalRawData);
+            return new SelfHelpDiagnosticInsight(id, title, results, insightImportanceLevel, additionalBinaryDataProperties);
         }
 
-        BinaryData IPersistableModel<SelfHelpDiagnosticInsight>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpDiagnosticInsight>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="options"> The client options for reading and writing models. </param>
+        BinaryData IPersistableModel<SelfHelpDiagnosticInsight>.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
 
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpDiagnosticInsight>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
@@ -145,15 +151,20 @@ BinaryData IPersistableModel<SelfHelpDiagnosticInsight>.Write(ModelReaderWriterO
             }
         }
 
-        SelfHelpDiagnosticInsight IPersistableModel<SelfHelpDiagnosticInsight>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpDiagnosticInsight>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        SelfHelpDiagnosticInsight IPersistableModel<SelfHelpDiagnosticInsight>.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options);
 
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual SelfHelpDiagnosticInsight PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpDiagnosticInsight>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
+                    using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
                     {
-                        using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
                         return DeserializeSelfHelpDiagnosticInsight(document.RootElement, options);
                     }
                 default:
@@ -161,6 +172,7 @@ SelfHelpDiagnosticInsight IPersistableModel<SelfHelpDiagnosticInsight>.Create(Bi
             }
         }
 
+        /// <param name="options"> The client options for reading and writing models. </param>
         string IPersistableModel<SelfHelpDiagnosticInsight>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpDiagnosticInsight.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpDiagnosticInsight.cs
index 4d48ca9d4f91..ca354561e4b4 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpDiagnosticInsight.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpDiagnosticInsight.cs
@@ -13,37 +13,8 @@ namespace Azure.ResourceManager.SelfHelp.Models
     /// <summary> Detailed insights(s) obtained via the invocation of an insight diagnostic. </summary>
     public partial class SelfHelpDiagnosticInsight
     {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+        /// <summary> Keeps track of any properties unknown to the library. </summary>
+        private protected readonly IDictionary<string, BinaryData> _additionalBinaryDataProperties;
 
         /// <summary> Initializes a new instance of <see cref="SelfHelpDiagnosticInsight"/>. </summary>
         internal SelfHelpDiagnosticInsight()
@@ -55,22 +26,25 @@ internal SelfHelpDiagnosticInsight()
         /// <param name="title"> This insight's title. </param>
         /// <param name="results"> Detailed result content. </param>
         /// <param name="insightImportanceLevel"> Importance level of the insight. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal SelfHelpDiagnosticInsight(string id, string title, string results, SelfHelpImportanceLevel? insightImportanceLevel, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        /// <param name="additionalBinaryDataProperties"> Keeps track of any properties unknown to the library. </param>
+        internal SelfHelpDiagnosticInsight(string id, string title, string results, SelfHelpImportanceLevel? insightImportanceLevel, IDictionary<string, BinaryData> additionalBinaryDataProperties)
         {
             Id = id;
             Title = title;
             Results = results;
             InsightImportanceLevel = insightImportanceLevel;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
+            _additionalBinaryDataProperties = additionalBinaryDataProperties;
         }
 
         /// <summary> Article id. </summary>
         public string Id { get; }
+
         /// <summary> This insight's title. </summary>
         public string Title { get; }
+
         /// <summary> Detailed result content. </summary>
         public string Results { get; }
+
         /// <summary> Importance level of the insight. </summary>
         public SelfHelpImportanceLevel? InsightImportanceLevel { get; }
     }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpDiagnosticInvocation.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpDiagnosticInvocation.Serialization.cs
index 306c6dca3e5e..a02a54fe28c7 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpDiagnosticInvocation.Serialization.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpDiagnosticInvocation.Serialization.cs
@@ -9,14 +9,15 @@
 using System.ClientModel.Primitives;
 using System.Collections.Generic;
 using System.Text.Json;
-using Azure.Core;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
-    public partial class SelfHelpDiagnosticInvocation : IUtf8JsonSerializable, IJsonModel<SelfHelpDiagnosticInvocation>
+    /// <summary> Solution Invocation with additional params needed for invocation. </summary>
+    public partial class SelfHelpDiagnosticInvocation : IJsonModel<SelfHelpDiagnosticInvocation>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<SelfHelpDiagnosticInvocation>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
+        /// <param name="writer"> The JSON writer. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
         void IJsonModel<SelfHelpDiagnosticInvocation>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
@@ -28,12 +29,11 @@ void IJsonModel<SelfHelpDiagnosticInvocation>.Write(Utf8JsonWriter writer, Model
         /// <param name="options"> The client options for reading and writing models. </param>
         protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpDiagnosticInvocation>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpDiagnosticInvocation>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(SelfHelpDiagnosticInvocation)} does not support writing '{format}' format.");
             }
-
             if (Optional.IsDefined(SolutionId))
             {
                 writer.WritePropertyName("solutionId"u8);
@@ -46,19 +46,24 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
                 foreach (var item in AdditionalParameters)
                 {
                     writer.WritePropertyName(item.Key);
+                    if (item.Value == null)
+                    {
+                        writer.WriteNullValue();
+                        continue;
+                    }
                     writer.WriteStringValue(item.Value);
                 }
                 writer.WriteEndObject();
             }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            if (options.Format != "W" && _additionalBinaryDataProperties != null)
             {
-                foreach (var item in _serializedAdditionalRawData)
+                foreach (var item in _additionalBinaryDataProperties)
                 {
                     writer.WritePropertyName(item.Key);
 #if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
+                    writer.WriteRawValue(item.Value);
 #else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value, ModelSerializationExtensions.JsonDocumentOptions))
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
                     {
                         JsonSerializer.Serialize(writer, document.RootElement);
                     }
@@ -67,64 +72,77 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             }
         }
 
-        SelfHelpDiagnosticInvocation IJsonModel<SelfHelpDiagnosticInvocation>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        SelfHelpDiagnosticInvocation IJsonModel<SelfHelpDiagnosticInvocation>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options);
+
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual SelfHelpDiagnosticInvocation JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpDiagnosticInvocation>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpDiagnosticInvocation>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(SelfHelpDiagnosticInvocation)} does not support reading '{format}' format.");
             }
-
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
             return DeserializeSelfHelpDiagnosticInvocation(document.RootElement, options);
         }
 
-        internal static SelfHelpDiagnosticInvocation DeserializeSelfHelpDiagnosticInvocation(JsonElement element, ModelReaderWriterOptions options = null)
+        /// <param name="element"> The JSON element to deserialize. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        internal static SelfHelpDiagnosticInvocation DeserializeSelfHelpDiagnosticInvocation(JsonElement element, ModelReaderWriterOptions options)
         {
-            options ??= ModelSerializationExtensions.WireOptions;
-
             if (element.ValueKind == JsonValueKind.Null)
             {
                 return null;
             }
             string solutionId = default;
             IDictionary<string, string> additionalParameters = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
+            IDictionary<string, BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            foreach (var prop in element.EnumerateObject())
             {
-                if (property.NameEquals("solutionId"u8))
+                if (prop.NameEquals("solutionId"u8))
                 {
-                    solutionId = property.Value.GetString();
+                    solutionId = prop.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("additionalParameters"u8))
+                if (prop.NameEquals("additionalParameters"u8))
                 {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
                     Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
+                    foreach (var prop0 in prop.Value.EnumerateObject())
                     {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
+                        if (prop0.Value.ValueKind == JsonValueKind.Null)
+                        {
+                            dictionary.Add(prop0.Name, null);
+                        }
+                        else
+                        {
+                            dictionary.Add(prop0.Name, prop0.Value.GetString());
+                        }
                     }
                     additionalParameters = dictionary;
                     continue;
                 }
                 if (options.Format != "W")
                 {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                    additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText()));
                 }
             }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new SelfHelpDiagnosticInvocation(solutionId, additionalParameters ?? new ChangeTrackingDictionary<string, string>(), serializedAdditionalRawData);
+            return new SelfHelpDiagnosticInvocation(solutionId, additionalParameters ?? new ChangeTrackingDictionary<string, string>(), additionalBinaryDataProperties);
         }
 
-        BinaryData IPersistableModel<SelfHelpDiagnosticInvocation>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpDiagnosticInvocation>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="options"> The client options for reading and writing models. </param>
+        BinaryData IPersistableModel<SelfHelpDiagnosticInvocation>.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
 
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpDiagnosticInvocation>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
@@ -134,15 +152,20 @@ BinaryData IPersistableModel<SelfHelpDiagnosticInvocation>.Write(ModelReaderWrit
             }
         }
 
-        SelfHelpDiagnosticInvocation IPersistableModel<SelfHelpDiagnosticInvocation>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpDiagnosticInvocation>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        SelfHelpDiagnosticInvocation IPersistableModel<SelfHelpDiagnosticInvocation>.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options);
 
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual SelfHelpDiagnosticInvocation PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpDiagnosticInvocation>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
+                    using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
                     {
-                        using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
                         return DeserializeSelfHelpDiagnosticInvocation(document.RootElement, options);
                     }
                 default:
@@ -150,6 +173,7 @@ SelfHelpDiagnosticInvocation IPersistableModel<SelfHelpDiagnosticInvocation>.Cre
             }
         }
 
+        /// <param name="options"> The client options for reading and writing models. </param>
         string IPersistableModel<SelfHelpDiagnosticInvocation>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpDiagnosticInvocation.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpDiagnosticInvocation.cs
index b0102a78f5f9..7677236e7336 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpDiagnosticInvocation.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpDiagnosticInvocation.cs
@@ -7,43 +7,15 @@
 
 using System;
 using System.Collections.Generic;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
     /// <summary> Solution Invocation with additional params needed for invocation. </summary>
     public partial class SelfHelpDiagnosticInvocation
     {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+        /// <summary> Keeps track of any properties unknown to the library. </summary>
+        private protected readonly IDictionary<string, BinaryData> _additionalBinaryDataProperties;
 
         /// <summary> Initializes a new instance of <see cref="SelfHelpDiagnosticInvocation"/>. </summary>
         public SelfHelpDiagnosticInvocation()
@@ -54,16 +26,17 @@ public SelfHelpDiagnosticInvocation()
         /// <summary> Initializes a new instance of <see cref="SelfHelpDiagnosticInvocation"/>. </summary>
         /// <param name="solutionId"> Solution Id to invoke. </param>
         /// <param name="additionalParameters"> Additional parameters required to invoke the solutionId. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal SelfHelpDiagnosticInvocation(string solutionId, IDictionary<string, string> additionalParameters, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        /// <param name="additionalBinaryDataProperties"> Keeps track of any properties unknown to the library. </param>
+        internal SelfHelpDiagnosticInvocation(string solutionId, IDictionary<string, string> additionalParameters, IDictionary<string, BinaryData> additionalBinaryDataProperties)
         {
             SolutionId = solutionId;
             AdditionalParameters = additionalParameters;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
+            _additionalBinaryDataProperties = additionalBinaryDataProperties;
         }
 
         /// <summary> Solution Id to invoke. </summary>
         public string SolutionId { get; set; }
+
         /// <summary> Additional parameters required to invoke the solutionId. </summary>
         public IDictionary<string, string> AdditionalParameters { get; }
     }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpDiagnosticResourceProperties.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpDiagnosticResourceProperties.Serialization.cs
new file mode 100644
index 000000000000..aee85839df0a
--- /dev/null
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpDiagnosticResourceProperties.Serialization.cs
@@ -0,0 +1,254 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.ResourceManager.SelfHelp;
+
+namespace Azure.ResourceManager.SelfHelp.Models
+{
+    /// <summary> Diagnostic resource properties. </summary>
+    internal partial class SelfHelpDiagnosticResourceProperties : IJsonModel<SelfHelpDiagnosticResourceProperties>
+    {
+        /// <param name="writer"> The JSON writer. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        void IJsonModel<SelfHelpDiagnosticResourceProperties>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            writer.WriteStartObject();
+            JsonModelWriteCore(writer, options);
+            writer.WriteEndObject();
+        }
+
+        /// <param name="writer"> The JSON writer. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpDiagnosticResourceProperties>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(SelfHelpDiagnosticResourceProperties)} does not support writing '{format}' format.");
+            }
+            if (Optional.IsCollectionDefined(GlobalParameters))
+            {
+                writer.WritePropertyName("globalParameters"u8);
+                writer.WriteStartObject();
+                foreach (var item in GlobalParameters)
+                {
+                    writer.WritePropertyName(item.Key);
+                    if (item.Value == null)
+                    {
+                        writer.WriteNullValue();
+                        continue;
+                    }
+                    writer.WriteStringValue(item.Value);
+                }
+                writer.WriteEndObject();
+            }
+            if (Optional.IsCollectionDefined(Insights))
+            {
+                writer.WritePropertyName("insights"u8);
+                writer.WriteStartArray();
+                foreach (SelfHelpDiagnosticInvocation item in Insights)
+                {
+                    writer.WriteObjectValue(item, options);
+                }
+                writer.WriteEndArray();
+            }
+            if (options.Format != "W" && Optional.IsDefined(AcceptedOn))
+            {
+                writer.WritePropertyName("acceptedAt"u8);
+                writer.WriteStringValue(AcceptedOn.Value, "O");
+            }
+            if (options.Format != "W" && Optional.IsDefined(ProvisioningState))
+            {
+                writer.WritePropertyName("provisioningState"u8);
+                writer.WriteStringValue(ProvisioningState.Value.ToString());
+            }
+            if (options.Format != "W" && Optional.IsCollectionDefined(Diagnostics))
+            {
+                writer.WritePropertyName("diagnostics"u8);
+                writer.WriteStartArray();
+                foreach (SelfHelpDiagnosticInfo item in Diagnostics)
+                {
+                    writer.WriteObjectValue(item, options);
+                }
+                writer.WriteEndArray();
+            }
+            if (options.Format != "W" && _additionalBinaryDataProperties != null)
+            {
+                foreach (var item in _additionalBinaryDataProperties)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+                    writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+        }
+
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        SelfHelpDiagnosticResourceProperties IJsonModel<SelfHelpDiagnosticResourceProperties>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options);
+
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual SelfHelpDiagnosticResourceProperties JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpDiagnosticResourceProperties>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(SelfHelpDiagnosticResourceProperties)} does not support reading '{format}' format.");
+            }
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeSelfHelpDiagnosticResourceProperties(document.RootElement, options);
+        }
+
+        /// <param name="element"> The JSON element to deserialize. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        internal static SelfHelpDiagnosticResourceProperties DeserializeSelfHelpDiagnosticResourceProperties(JsonElement element, ModelReaderWriterOptions options)
+        {
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            IDictionary<string, string> globalParameters = default;
+            IList<SelfHelpDiagnosticInvocation> insights = default;
+            DateTimeOffset? acceptedOn = default;
+            SelfHelpProvisioningState? provisioningState = default;
+            IReadOnlyList<SelfHelpDiagnosticInfo> diagnostics = default;
+            IDictionary<string, BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            foreach (var prop in element.EnumerateObject())
+            {
+                if (prop.NameEquals("globalParameters"u8))
+                {
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
+                    foreach (var prop0 in prop.Value.EnumerateObject())
+                    {
+                        if (prop0.Value.ValueKind == JsonValueKind.Null)
+                        {
+                            dictionary.Add(prop0.Name, null);
+                        }
+                        else
+                        {
+                            dictionary.Add(prop0.Name, prop0.Value.GetString());
+                        }
+                    }
+                    globalParameters = dictionary;
+                    continue;
+                }
+                if (prop.NameEquals("insights"u8))
+                {
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    List<SelfHelpDiagnosticInvocation> array = new List<SelfHelpDiagnosticInvocation>();
+                    foreach (var item in prop.Value.EnumerateArray())
+                    {
+                        array.Add(SelfHelpDiagnosticInvocation.DeserializeSelfHelpDiagnosticInvocation(item, options));
+                    }
+                    insights = array;
+                    continue;
+                }
+                if (prop.NameEquals("acceptedAt"u8))
+                {
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    acceptedOn = prop.Value.GetDateTimeOffset("O");
+                    continue;
+                }
+                if (prop.NameEquals("provisioningState"u8))
+                {
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    provisioningState = new SelfHelpProvisioningState(prop.Value.GetString());
+                    continue;
+                }
+                if (prop.NameEquals("diagnostics"u8))
+                {
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    List<SelfHelpDiagnosticInfo> array = new List<SelfHelpDiagnosticInfo>();
+                    foreach (var item in prop.Value.EnumerateArray())
+                    {
+                        array.Add(SelfHelpDiagnosticInfo.DeserializeSelfHelpDiagnosticInfo(item, options));
+                    }
+                    diagnostics = array;
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText()));
+                }
+            }
+            return new SelfHelpDiagnosticResourceProperties(
+                globalParameters ?? new ChangeTrackingDictionary<string, string>(),
+                insights ?? new ChangeTrackingList<SelfHelpDiagnosticInvocation>(),
+                acceptedOn,
+                provisioningState,
+                diagnostics ?? new ChangeTrackingList<SelfHelpDiagnosticInfo>(),
+                additionalBinaryDataProperties);
+        }
+
+        /// <param name="options"> The client options for reading and writing models. </param>
+        BinaryData IPersistableModel<SelfHelpDiagnosticResourceProperties>.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
+
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpDiagnosticResourceProperties>)this).GetFormatFromOptions(options) : options.Format;
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options, AzureResourceManagerSelfHelpContext.Default);
+                default:
+                    throw new FormatException($"The model {nameof(SelfHelpDiagnosticResourceProperties)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        SelfHelpDiagnosticResourceProperties IPersistableModel<SelfHelpDiagnosticResourceProperties>.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options);
+
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual SelfHelpDiagnosticResourceProperties PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpDiagnosticResourceProperties>)this).GetFormatFromOptions(options) : options.Format;
+            switch (format)
+            {
+                case "J":
+                    using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
+                    {
+                        return DeserializeSelfHelpDiagnosticResourceProperties(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(SelfHelpDiagnosticResourceProperties)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        /// <param name="options"> The client options for reading and writing models. </param>
+        string IPersistableModel<SelfHelpDiagnosticResourceProperties>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+    }
+}
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpDiagnosticResourceProperties.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpDiagnosticResourceProperties.cs
new file mode 100644
index 000000000000..6a475d88de16
--- /dev/null
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpDiagnosticResourceProperties.cs
@@ -0,0 +1,60 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+using Azure.ResourceManager.SelfHelp;
+
+namespace Azure.ResourceManager.SelfHelp.Models
+{
+    /// <summary> Diagnostic resource properties. </summary>
+    internal partial class SelfHelpDiagnosticResourceProperties
+    {
+        /// <summary> Keeps track of any properties unknown to the library. </summary>
+        private protected readonly IDictionary<string, BinaryData> _additionalBinaryDataProperties;
+
+        /// <summary> Initializes a new instance of <see cref="SelfHelpDiagnosticResourceProperties"/>. </summary>
+        public SelfHelpDiagnosticResourceProperties()
+        {
+            GlobalParameters = new ChangeTrackingDictionary<string, string>();
+            Insights = new ChangeTrackingList<SelfHelpDiagnosticInvocation>();
+            Diagnostics = new ChangeTrackingList<SelfHelpDiagnosticInfo>();
+        }
+
+        /// <summary> Initializes a new instance of <see cref="SelfHelpDiagnosticResourceProperties"/>. </summary>
+        /// <param name="globalParameters"> Global parameters is an optional map which can be used to add key and  value to request body to improve the diagnostics results. </param>
+        /// <param name="insights"> SolutionIds that are needed to be invoked. </param>
+        /// <param name="acceptedOn"> Diagnostic Request Accepted time. </param>
+        /// <param name="provisioningState"> Status of diagnostic provisioning. </param>
+        /// <param name="diagnostics"> Array of Diagnostics. </param>
+        /// <param name="additionalBinaryDataProperties"> Keeps track of any properties unknown to the library. </param>
+        internal SelfHelpDiagnosticResourceProperties(IDictionary<string, string> globalParameters, IList<SelfHelpDiagnosticInvocation> insights, DateTimeOffset? acceptedOn, SelfHelpProvisioningState? provisioningState, IReadOnlyList<SelfHelpDiagnosticInfo> diagnostics, IDictionary<string, BinaryData> additionalBinaryDataProperties)
+        {
+            GlobalParameters = globalParameters;
+            Insights = insights;
+            AcceptedOn = acceptedOn;
+            ProvisioningState = provisioningState;
+            Diagnostics = diagnostics;
+            _additionalBinaryDataProperties = additionalBinaryDataProperties;
+        }
+
+        /// <summary> Global parameters is an optional map which can be used to add key and  value to request body to improve the diagnostics results. </summary>
+        public IDictionary<string, string> GlobalParameters { get; } = new ChangeTrackingDictionary<string, string>();
+
+        /// <summary> SolutionIds that are needed to be invoked. </summary>
+        public IList<SelfHelpDiagnosticInvocation> Insights { get; } = new ChangeTrackingList<SelfHelpDiagnosticInvocation>();
+
+        /// <summary> Diagnostic Request Accepted time. </summary>
+        public DateTimeOffset? AcceptedOn { get; }
+
+        /// <summary> Status of diagnostic provisioning. </summary>
+        public SelfHelpProvisioningState? ProvisioningState { get; }
+
+        /// <summary> Array of Diagnostics. </summary>
+        public IReadOnlyList<SelfHelpDiagnosticInfo> Diagnostics { get; } = new ChangeTrackingList<SelfHelpDiagnosticInfo>();
+    }
+}
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpDiagnosticStatus.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpDiagnosticStatus.cs
index e700d961c1ce..8519f69941da 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpDiagnosticStatus.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpDiagnosticStatus.cs
@@ -7,6 +7,7 @@
 
 using System;
 using System.ComponentModel;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
@@ -14,47 +15,72 @@ namespace Azure.ResourceManager.SelfHelp.Models
     public readonly partial struct SelfHelpDiagnosticStatus : IEquatable<SelfHelpDiagnosticStatus>
     {
         private readonly string _value;
+        /// <summary> Diagnostic creation failed. </summary>
+        private const string FailedValue = "Failed";
+        /// <summary> Request is missing required inputs to run. </summary>
+        private const string MissingInputsValue = "MissingInputs";
+        /// <summary> Diagnostic is still running. </summary>
+        private const string RunningValue = "Running";
+        /// <summary> Diagnostic creation succeeded. </summary>
+        private const string SucceededValue = "Succeeded";
+        /// <summary> Diagnostic was timed out. </summary>
+        private const string TimeoutValue = "Timeout";
 
         /// <summary> Initializes a new instance of <see cref="SelfHelpDiagnosticStatus"/>. </summary>
+        /// <param name="value"> The value. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
         public SelfHelpDiagnosticStatus(string value)
         {
-            _value = value ?? throw new ArgumentNullException(nameof(value));
-        }
+            Argument.AssertNotNull(value, nameof(value));
 
-        private const string FailedValue = "Failed";
-        private const string MissingInputsValue = "MissingInputs";
-        private const string RunningValue = "Running";
-        private const string SucceededValue = "Succeeded";
-        private const string TimeoutValue = "Timeout";
+            _value = value;
+        }
 
         /// <summary> Diagnostic creation failed. </summary>
         public static SelfHelpDiagnosticStatus Failed { get; } = new SelfHelpDiagnosticStatus(FailedValue);
+
         /// <summary> Request is missing required inputs to run. </summary>
         public static SelfHelpDiagnosticStatus MissingInputs { get; } = new SelfHelpDiagnosticStatus(MissingInputsValue);
+
         /// <summary> Diagnostic is still running. </summary>
         public static SelfHelpDiagnosticStatus Running { get; } = new SelfHelpDiagnosticStatus(RunningValue);
+
         /// <summary> Diagnostic creation succeeded. </summary>
         public static SelfHelpDiagnosticStatus Succeeded { get; } = new SelfHelpDiagnosticStatus(SucceededValue);
+
         /// <summary> Diagnostic was timed out. </summary>
         public static SelfHelpDiagnosticStatus Timeout { get; } = new SelfHelpDiagnosticStatus(TimeoutValue);
+
         /// <summary> Determines if two <see cref="SelfHelpDiagnosticStatus"/> values are the same. </summary>
+        /// <param name="left"> The left value to compare. </param>
+        /// <param name="right"> The right value to compare. </param>
         public static bool operator ==(SelfHelpDiagnosticStatus left, SelfHelpDiagnosticStatus right) => left.Equals(right);
+
         /// <summary> Determines if two <see cref="SelfHelpDiagnosticStatus"/> values are not the same. </summary>
+        /// <param name="left"> The left value to compare. </param>
+        /// <param name="right"> The right value to compare. </param>
         public static bool operator !=(SelfHelpDiagnosticStatus left, SelfHelpDiagnosticStatus right) => !left.Equals(right);
-        /// <summary> Converts a <see cref="string"/> to a <see cref="SelfHelpDiagnosticStatus"/>. </summary>
+
+        /// <summary> Converts a string to a <see cref="SelfHelpDiagnosticStatus"/>. </summary>
+        /// <param name="value"> The value. </param>
         public static implicit operator SelfHelpDiagnosticStatus(string value) => new SelfHelpDiagnosticStatus(value);
 
-        /// <inheritdoc />
+        /// <summary> Converts a string to a <see cref="SelfHelpDiagnosticStatus"/>. </summary>
+        /// <param name="value"> The value. </param>
+        public static implicit operator SelfHelpDiagnosticStatus?(string value) => value == null ? null : new SelfHelpDiagnosticStatus(value);
+
+        /// <inheritdoc/>
         [EditorBrowsable(EditorBrowsableState.Never)]
         public override bool Equals(object obj) => obj is SelfHelpDiagnosticStatus other && Equals(other);
-        /// <inheritdoc />
+
+        /// <inheritdoc/>
         public bool Equals(SelfHelpDiagnosticStatus other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
 
-        /// <inheritdoc />
+        /// <inheritdoc/>
         [EditorBrowsable(EditorBrowsableState.Never)]
         public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
-        /// <inheritdoc />
+
+        /// <inheritdoc/>
         public override string ToString() => _value;
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpDiscoverySolutionResult.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpDiscoverySolutionResult.Serialization.cs
index e6c04f706e7a..a11af8a4a6bb 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpDiscoverySolutionResult.Serialization.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpDiscoverySolutionResult.Serialization.cs
@@ -9,14 +9,21 @@
 using System.ClientModel.Primitives;
 using System.Collections.Generic;
 using System.Text.Json;
-using Azure.Core;
+using Azure;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
-    internal partial class SelfHelpDiscoverySolutionResult : IUtf8JsonSerializable, IJsonModel<SelfHelpDiscoverySolutionResult>
+    /// <summary> Discovery response. </summary>
+    internal partial class SelfHelpDiscoverySolutionResult : IJsonModel<SelfHelpDiscoverySolutionResult>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<SelfHelpDiscoverySolutionResult>)this).Write(writer, ModelSerializationExtensions.WireOptions);
+        /// <summary> Initializes a new instance of <see cref="SelfHelpDiscoverySolutionResult"/> for deserialization. </summary>
+        internal SelfHelpDiscoverySolutionResult()
+        {
+        }
 
+        /// <param name="writer"> The JSON writer. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
         void IJsonModel<SelfHelpDiscoverySolutionResult>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
@@ -28,15 +35,14 @@ void IJsonModel<SelfHelpDiscoverySolutionResult>.Write(Utf8JsonWriter writer, Mo
         /// <param name="options"> The client options for reading and writing models. </param>
         protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpDiscoverySolutionResult>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpDiscoverySolutionResult>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(SelfHelpDiscoverySolutionResult)} does not support writing '{format}' format.");
             }
-
             writer.WritePropertyName("value"u8);
             writer.WriteStartArray();
-            foreach (var item in Value)
+            foreach (SelfHelpSolutionMetadata item in Value)
             {
                 writer.WriteObjectValue(item, options);
             }
@@ -46,15 +52,15 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
                 writer.WritePropertyName("nextLink"u8);
                 writer.WriteStringValue(NextLink.AbsoluteUri);
             }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            if (options.Format != "W" && _additionalBinaryDataProperties != null)
             {
-                foreach (var item in _serializedAdditionalRawData)
+                foreach (var item in _additionalBinaryDataProperties)
                 {
                     writer.WritePropertyName(item.Key);
 #if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
+                    writer.WriteRawValue(item.Value);
 #else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value, ModelSerializationExtensions.JsonDocumentOptions))
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
                     {
                         JsonSerializer.Serialize(writer, document.RootElement);
                     }
@@ -63,64 +69,70 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             }
         }
 
-        SelfHelpDiscoverySolutionResult IJsonModel<SelfHelpDiscoverySolutionResult>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        SelfHelpDiscoverySolutionResult IJsonModel<SelfHelpDiscoverySolutionResult>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options);
+
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual SelfHelpDiscoverySolutionResult JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpDiscoverySolutionResult>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpDiscoverySolutionResult>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(SelfHelpDiscoverySolutionResult)} does not support reading '{format}' format.");
             }
-
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
             return DeserializeSelfHelpDiscoverySolutionResult(document.RootElement, options);
         }
 
-        internal static SelfHelpDiscoverySolutionResult DeserializeSelfHelpDiscoverySolutionResult(JsonElement element, ModelReaderWriterOptions options = null)
+        /// <param name="element"> The JSON element to deserialize. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        internal static SelfHelpDiscoverySolutionResult DeserializeSelfHelpDiscoverySolutionResult(JsonElement element, ModelReaderWriterOptions options)
         {
-            options ??= ModelSerializationExtensions.WireOptions;
-
             if (element.ValueKind == JsonValueKind.Null)
             {
                 return null;
             }
-            IReadOnlyList<SelfHelpSolutionMetadata> value = default;
+            IList<SelfHelpSolutionMetadata> value = default;
             Uri nextLink = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
+            IDictionary<string, BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            foreach (var prop in element.EnumerateObject())
             {
-                if (property.NameEquals("value"u8))
+                if (prop.NameEquals("value"u8))
                 {
                     List<SelfHelpSolutionMetadata> array = new List<SelfHelpSolutionMetadata>();
-                    foreach (var item in property.Value.EnumerateArray())
+                    foreach (var item in prop.Value.EnumerateArray())
                     {
                         array.Add(SelfHelpSolutionMetadata.DeserializeSelfHelpSolutionMetadata(item, options));
                     }
                     value = array;
                     continue;
                 }
-                if (property.NameEquals("nextLink"u8))
+                if (prop.NameEquals("nextLink"u8))
                 {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
-                    nextLink = new Uri(property.Value.GetString());
+                    nextLink = new Uri(prop.Value.GetString());
                     continue;
                 }
                 if (options.Format != "W")
                 {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                    additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText()));
                 }
             }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new SelfHelpDiscoverySolutionResult(value, nextLink, serializedAdditionalRawData);
+            return new SelfHelpDiscoverySolutionResult(value, nextLink, additionalBinaryDataProperties);
         }
 
-        BinaryData IPersistableModel<SelfHelpDiscoverySolutionResult>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpDiscoverySolutionResult>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="options"> The client options for reading and writing models. </param>
+        BinaryData IPersistableModel<SelfHelpDiscoverySolutionResult>.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
 
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpDiscoverySolutionResult>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
@@ -130,15 +142,20 @@ BinaryData IPersistableModel<SelfHelpDiscoverySolutionResult>.Write(ModelReaderW
             }
         }
 
-        SelfHelpDiscoverySolutionResult IPersistableModel<SelfHelpDiscoverySolutionResult>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpDiscoverySolutionResult>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        SelfHelpDiscoverySolutionResult IPersistableModel<SelfHelpDiscoverySolutionResult>.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options);
 
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual SelfHelpDiscoverySolutionResult PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpDiscoverySolutionResult>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
+                    using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
                     {
-                        using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
                         return DeserializeSelfHelpDiscoverySolutionResult(document.RootElement, options);
                     }
                 default:
@@ -146,6 +163,14 @@ SelfHelpDiscoverySolutionResult IPersistableModel<SelfHelpDiscoverySolutionResul
             }
         }
 
+        /// <param name="options"> The client options for reading and writing models. </param>
         string IPersistableModel<SelfHelpDiscoverySolutionResult>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <param name="response"> The <see cref="Response"/> to deserialize the <see cref="SelfHelpDiscoverySolutionResult"/> from. </param>
+        internal static SelfHelpDiscoverySolutionResult FromResponse(Response response)
+        {
+            using JsonDocument document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions);
+            return DeserializeSelfHelpDiscoverySolutionResult(document.RootElement, ModelSerializationExtensions.WireOptions);
+        }
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpDiscoverySolutionResult.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpDiscoverySolutionResult.cs
index 8498f79dc583..f89ba734e2d4 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpDiscoverySolutionResult.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpDiscoverySolutionResult.cs
@@ -14,66 +14,30 @@ namespace Azure.ResourceManager.SelfHelp.Models
     /// <summary> Discovery response. </summary>
     internal partial class SelfHelpDiscoverySolutionResult
     {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+        /// <summary> Keeps track of any properties unknown to the library. </summary>
+        private protected readonly IDictionary<string, BinaryData> _additionalBinaryDataProperties;
 
         /// <summary> Initializes a new instance of <see cref="SelfHelpDiscoverySolutionResult"/>. </summary>
         /// <param name="value"> The SolutionMetadataResource items on this page. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
         internal SelfHelpDiscoverySolutionResult(IEnumerable<SelfHelpSolutionMetadata> value)
         {
-            Argument.AssertNotNull(value, nameof(value));
-
             Value = value.ToList();
         }
 
         /// <summary> Initializes a new instance of <see cref="SelfHelpDiscoverySolutionResult"/>. </summary>
         /// <param name="value"> The SolutionMetadataResource items on this page. </param>
         /// <param name="nextLink"> The link to the next page of items. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal SelfHelpDiscoverySolutionResult(IReadOnlyList<SelfHelpSolutionMetadata> value, Uri nextLink, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        /// <param name="additionalBinaryDataProperties"> Keeps track of any properties unknown to the library. </param>
+        internal SelfHelpDiscoverySolutionResult(IList<SelfHelpSolutionMetadata> value, Uri nextLink, IDictionary<string, BinaryData> additionalBinaryDataProperties)
         {
             Value = value;
             NextLink = nextLink;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SelfHelpDiscoverySolutionResult"/> for deserialization. </summary>
-        internal SelfHelpDiscoverySolutionResult()
-        {
+            _additionalBinaryDataProperties = additionalBinaryDataProperties;
         }
 
         /// <summary> The SolutionMetadataResource items on this page. </summary>
-        public IReadOnlyList<SelfHelpSolutionMetadata> Value { get; }
+        public IList<SelfHelpSolutionMetadata> Value { get; }
+
         /// <summary> The link to the next page of items. </summary>
         public Uri NextLink { get; }
     }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpError.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpError.Serialization.cs
index aa88f1db38fe..43c5f1545197 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpError.Serialization.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpError.Serialization.cs
@@ -9,14 +9,15 @@
 using System.ClientModel.Primitives;
 using System.Collections.Generic;
 using System.Text.Json;
-using Azure.Core;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
-    public partial class SelfHelpError : IUtf8JsonSerializable, IJsonModel<SelfHelpError>
+    /// <summary> Error definition. </summary>
+    public partial class SelfHelpError : IJsonModel<SelfHelpError>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<SelfHelpError>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
+        /// <param name="writer"> The JSON writer. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
         void IJsonModel<SelfHelpError>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
@@ -28,12 +29,11 @@ void IJsonModel<SelfHelpError>.Write(Utf8JsonWriter writer, ModelReaderWriterOpt
         /// <param name="options"> The client options for reading and writing models. </param>
         protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpError>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpError>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(SelfHelpError)} does not support writing '{format}' format.");
             }
-
             if (options.Format != "W" && Optional.IsDefined(Code))
             {
                 writer.WritePropertyName("code"u8);
@@ -53,21 +53,21 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             {
                 writer.WritePropertyName("details"u8);
                 writer.WriteStartArray();
-                foreach (var item in Details)
+                foreach (SelfHelpError item in Details)
                 {
                     writer.WriteObjectValue(item, options);
                 }
                 writer.WriteEndArray();
             }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            if (options.Format != "W" && _additionalBinaryDataProperties != null)
             {
-                foreach (var item in _serializedAdditionalRawData)
+                foreach (var item in _additionalBinaryDataProperties)
                 {
                     writer.WritePropertyName(item.Key);
 #if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
+                    writer.WriteRawValue(item.Value);
 #else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value, ModelSerializationExtensions.JsonDocumentOptions))
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
                     {
                         JsonSerializer.Serialize(writer, document.RootElement);
                     }
@@ -76,57 +76,61 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             }
         }
 
-        SelfHelpError IJsonModel<SelfHelpError>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        SelfHelpError IJsonModel<SelfHelpError>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options);
+
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual SelfHelpError JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpError>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpError>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(SelfHelpError)} does not support reading '{format}' format.");
             }
-
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
             return DeserializeSelfHelpError(document.RootElement, options);
         }
 
-        internal static SelfHelpError DeserializeSelfHelpError(JsonElement element, ModelReaderWriterOptions options = null)
+        /// <param name="element"> The JSON element to deserialize. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        internal static SelfHelpError DeserializeSelfHelpError(JsonElement element, ModelReaderWriterOptions options)
         {
-            options ??= ModelSerializationExtensions.WireOptions;
-
             if (element.ValueKind == JsonValueKind.Null)
             {
                 return null;
             }
             string code = default;
-            string type = default;
+            string errorType = default;
             string message = default;
             IReadOnlyList<SelfHelpError> details = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
+            IDictionary<string, BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            foreach (var prop in element.EnumerateObject())
             {
-                if (property.NameEquals("code"u8))
+                if (prop.NameEquals("code"u8))
                 {
-                    code = property.Value.GetString();
+                    code = prop.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("type"u8))
+                if (prop.NameEquals("type"u8))
                 {
-                    type = property.Value.GetString();
+                    errorType = prop.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("message"u8))
+                if (prop.NameEquals("message"u8))
                 {
-                    message = property.Value.GetString();
+                    message = prop.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("details"u8))
+                if (prop.NameEquals("details"u8))
                 {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
                     List<SelfHelpError> array = new List<SelfHelpError>();
-                    foreach (var item in property.Value.EnumerateArray())
+                    foreach (var item in prop.Value.EnumerateArray())
                     {
                         array.Add(DeserializeSelfHelpError(item, options));
                     }
@@ -135,17 +139,19 @@ internal static SelfHelpError DeserializeSelfHelpError(JsonElement element, Mode
                 }
                 if (options.Format != "W")
                 {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                    additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText()));
                 }
             }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new SelfHelpError(code, type, message, details ?? new ChangeTrackingList<SelfHelpError>(), serializedAdditionalRawData);
+            return new SelfHelpError(code, errorType, message, details ?? new ChangeTrackingList<SelfHelpError>(), additionalBinaryDataProperties);
         }
 
-        BinaryData IPersistableModel<SelfHelpError>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpError>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="options"> The client options for reading and writing models. </param>
+        BinaryData IPersistableModel<SelfHelpError>.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
 
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpError>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
@@ -155,15 +161,20 @@ BinaryData IPersistableModel<SelfHelpError>.Write(ModelReaderWriterOptions optio
             }
         }
 
-        SelfHelpError IPersistableModel<SelfHelpError>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpError>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        SelfHelpError IPersistableModel<SelfHelpError>.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options);
 
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual SelfHelpError PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpError>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
+                    using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
                     {
-                        using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
                         return DeserializeSelfHelpError(document.RootElement, options);
                     }
                 default:
@@ -171,6 +182,7 @@ SelfHelpError IPersistableModel<SelfHelpError>.Create(BinaryData data, ModelRead
             }
         }
 
+        /// <param name="options"> The client options for reading and writing models. </param>
         string IPersistableModel<SelfHelpError>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpError.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpError.cs
index 7a73ddd49985..b7572d1d0b6c 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpError.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpError.cs
@@ -7,43 +7,15 @@
 
 using System;
 using System.Collections.Generic;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
     /// <summary> Error definition. </summary>
     public partial class SelfHelpError
     {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+        /// <summary> Keeps track of any properties unknown to the library. </summary>
+        private protected readonly IDictionary<string, BinaryData> _additionalBinaryDataProperties;
 
         /// <summary> Initializes a new instance of <see cref="SelfHelpError"/>. </summary>
         internal SelfHelpError()
@@ -56,22 +28,25 @@ internal SelfHelpError()
         /// <param name="errorType"> Service specific error type which serves as additional context for the error herein. </param>
         /// <param name="message"> Description of the error. </param>
         /// <param name="details"> An array of additional nested error response info objects, as described by this contract. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal SelfHelpError(string code, string errorType, string message, IReadOnlyList<SelfHelpError> details, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        /// <param name="additionalBinaryDataProperties"> Keeps track of any properties unknown to the library. </param>
+        internal SelfHelpError(string code, string errorType, string message, IReadOnlyList<SelfHelpError> details, IDictionary<string, BinaryData> additionalBinaryDataProperties)
         {
             Code = code;
             ErrorType = errorType;
             Message = message;
             Details = details;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
+            _additionalBinaryDataProperties = additionalBinaryDataProperties;
         }
 
         /// <summary> Service specific error code which serves as the substatus for the HTTP error code. </summary>
         public string Code { get; }
+
         /// <summary> Service specific error type which serves as additional context for the error herein. </summary>
         public string ErrorType { get; }
+
         /// <summary> Description of the error. </summary>
         public string Message { get; }
+
         /// <summary> An array of additional nested error response info objects, as described by this contract. </summary>
         public IReadOnlyList<SelfHelpError> Details { get; }
     }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpFilter.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpFilter.Serialization.cs
index be7cf174adf0..783562b4760d 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpFilter.Serialization.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpFilter.Serialization.cs
@@ -9,14 +9,15 @@
 using System.ClientModel.Primitives;
 using System.Collections.Generic;
 using System.Text.Json;
-using Azure.Core;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
-    public partial class SelfHelpFilter : IUtf8JsonSerializable, IJsonModel<SelfHelpFilter>
+    /// <summary> Filter criterion. </summary>
+    public partial class SelfHelpFilter : IJsonModel<SelfHelpFilter>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<SelfHelpFilter>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
+        /// <param name="writer"> The JSON writer. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
         void IJsonModel<SelfHelpFilter>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
@@ -28,12 +29,11 @@ void IJsonModel<SelfHelpFilter>.Write(Utf8JsonWriter writer, ModelReaderWriterOp
         /// <param name="options"> The client options for reading and writing models. </param>
         protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpFilter>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpFilter>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(SelfHelpFilter)} does not support writing '{format}' format.");
             }
-
             if (Optional.IsDefined(Name))
             {
                 writer.WritePropertyName("name"u8);
@@ -49,15 +49,15 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
                 writer.WritePropertyName("operator"u8);
                 writer.WriteStringValue(Operator);
             }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            if (options.Format != "W" && _additionalBinaryDataProperties != null)
             {
-                foreach (var item in _serializedAdditionalRawData)
+                foreach (var item in _additionalBinaryDataProperties)
                 {
                     writer.WritePropertyName(item.Key);
 #if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
+                    writer.WriteRawValue(item.Value);
 #else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value, ModelSerializationExtensions.JsonDocumentOptions))
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
                     {
                         JsonSerializer.Serialize(writer, document.RootElement);
                     }
@@ -66,22 +66,27 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             }
         }
 
-        SelfHelpFilter IJsonModel<SelfHelpFilter>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        SelfHelpFilter IJsonModel<SelfHelpFilter>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options);
+
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual SelfHelpFilter JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpFilter>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpFilter>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(SelfHelpFilter)} does not support reading '{format}' format.");
             }
-
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
             return DeserializeSelfHelpFilter(document.RootElement, options);
         }
 
-        internal static SelfHelpFilter DeserializeSelfHelpFilter(JsonElement element, ModelReaderWriterOptions options = null)
+        /// <param name="element"> The JSON element to deserialize. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        internal static SelfHelpFilter DeserializeSelfHelpFilter(JsonElement element, ModelReaderWriterOptions options)
         {
-            options ??= ModelSerializationExtensions.WireOptions;
-
             if (element.ValueKind == JsonValueKind.Null)
             {
                 return null;
@@ -89,38 +94,39 @@ internal static SelfHelpFilter DeserializeSelfHelpFilter(JsonElement element, Mo
             string name = default;
             string values = default;
             string @operator = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
+            IDictionary<string, BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            foreach (var prop in element.EnumerateObject())
             {
-                if (property.NameEquals("name"u8))
+                if (prop.NameEquals("name"u8))
                 {
-                    name = property.Value.GetString();
+                    name = prop.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("values"u8))
+                if (prop.NameEquals("values"u8))
                 {
-                    values = property.Value.GetString();
+                    values = prop.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("operator"u8))
+                if (prop.NameEquals("operator"u8))
                 {
-                    @operator = property.Value.GetString();
+                    @operator = prop.Value.GetString();
                     continue;
                 }
                 if (options.Format != "W")
                 {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                    additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText()));
                 }
             }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new SelfHelpFilter(name, values, @operator, serializedAdditionalRawData);
+            return new SelfHelpFilter(name, values, @operator, additionalBinaryDataProperties);
         }
 
-        BinaryData IPersistableModel<SelfHelpFilter>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpFilter>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="options"> The client options for reading and writing models. </param>
+        BinaryData IPersistableModel<SelfHelpFilter>.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
 
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpFilter>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
@@ -130,15 +136,20 @@ BinaryData IPersistableModel<SelfHelpFilter>.Write(ModelReaderWriterOptions opti
             }
         }
 
-        SelfHelpFilter IPersistableModel<SelfHelpFilter>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpFilter>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        SelfHelpFilter IPersistableModel<SelfHelpFilter>.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options);
 
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual SelfHelpFilter PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpFilter>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
+                    using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
                     {
-                        using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
                         return DeserializeSelfHelpFilter(document.RootElement, options);
                     }
                 default:
@@ -146,6 +157,7 @@ SelfHelpFilter IPersistableModel<SelfHelpFilter>.Create(BinaryData data, ModelRe
             }
         }
 
+        /// <param name="options"> The client options for reading and writing models. </param>
         string IPersistableModel<SelfHelpFilter>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpFilter.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpFilter.cs
index 51b52e3ee819..035aa4f834c2 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpFilter.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpFilter.cs
@@ -13,37 +13,8 @@ namespace Azure.ResourceManager.SelfHelp.Models
     /// <summary> Filter criterion. </summary>
     public partial class SelfHelpFilter
     {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+        /// <summary> Keeps track of any properties unknown to the library. </summary>
+        private protected readonly IDictionary<string, BinaryData> _additionalBinaryDataProperties;
 
         /// <summary> Initializes a new instance of <see cref="SelfHelpFilter"/>. </summary>
         internal SelfHelpFilter()
@@ -54,19 +25,21 @@ internal SelfHelpFilter()
         /// <param name="name"> Filter name. </param>
         /// <param name="values"> Filter values. </param>
         /// <param name="operator"> Filter operator. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal SelfHelpFilter(string name, string values, string @operator, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        /// <param name="additionalBinaryDataProperties"> Keeps track of any properties unknown to the library. </param>
+        internal SelfHelpFilter(string name, string values, string @operator, IDictionary<string, BinaryData> additionalBinaryDataProperties)
         {
             Name = name;
             Values = values;
             Operator = @operator;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
+            _additionalBinaryDataProperties = additionalBinaryDataProperties;
         }
 
         /// <summary> Filter name. </summary>
         public string Name { get; }
+
         /// <summary> Filter values. </summary>
         public string Values { get; }
+
         /// <summary> Filter operator. </summary>
         public string Operator { get; }
     }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpImportanceLevel.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpImportanceLevel.cs
index 1cc87f0b0a6f..26f9abbf23d3 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpImportanceLevel.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpImportanceLevel.cs
@@ -7,6 +7,7 @@
 
 using System;
 using System.ComponentModel;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
@@ -14,41 +15,62 @@ namespace Azure.ResourceManager.SelfHelp.Models
     public readonly partial struct SelfHelpImportanceLevel : IEquatable<SelfHelpImportanceLevel>
     {
         private readonly string _value;
+        /// <summary> A critical insight has been found after running the diagnostic. </summary>
+        private const string CriticalValue = "Critical";
+        /// <summary> A warning insight has been found after running the diagnostic. </summary>
+        private const string WarningValue = "Warning";
+        /// <summary> An information insight has been found after running the diagnostic. </summary>
+        private const string InformationValue = "Information";
 
         /// <summary> Initializes a new instance of <see cref="SelfHelpImportanceLevel"/>. </summary>
+        /// <param name="value"> The value. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
         public SelfHelpImportanceLevel(string value)
         {
-            _value = value ?? throw new ArgumentNullException(nameof(value));
-        }
+            Argument.AssertNotNull(value, nameof(value));
 
-        private const string CriticalValue = "Critical";
-        private const string WarningValue = "Warning";
-        private const string InformationValue = "Information";
+            _value = value;
+        }
 
         /// <summary> A critical insight has been found after running the diagnostic. </summary>
         public static SelfHelpImportanceLevel Critical { get; } = new SelfHelpImportanceLevel(CriticalValue);
+
         /// <summary> A warning insight has been found after running the diagnostic. </summary>
         public static SelfHelpImportanceLevel Warning { get; } = new SelfHelpImportanceLevel(WarningValue);
+
         /// <summary> An information insight has been found after running the diagnostic. </summary>
         public static SelfHelpImportanceLevel Information { get; } = new SelfHelpImportanceLevel(InformationValue);
+
         /// <summary> Determines if two <see cref="SelfHelpImportanceLevel"/> values are the same. </summary>
+        /// <param name="left"> The left value to compare. </param>
+        /// <param name="right"> The right value to compare. </param>
         public static bool operator ==(SelfHelpImportanceLevel left, SelfHelpImportanceLevel right) => left.Equals(right);
+
         /// <summary> Determines if two <see cref="SelfHelpImportanceLevel"/> values are not the same. </summary>
+        /// <param name="left"> The left value to compare. </param>
+        /// <param name="right"> The right value to compare. </param>
         public static bool operator !=(SelfHelpImportanceLevel left, SelfHelpImportanceLevel right) => !left.Equals(right);
-        /// <summary> Converts a <see cref="string"/> to a <see cref="SelfHelpImportanceLevel"/>. </summary>
+
+        /// <summary> Converts a string to a <see cref="SelfHelpImportanceLevel"/>. </summary>
+        /// <param name="value"> The value. </param>
         public static implicit operator SelfHelpImportanceLevel(string value) => new SelfHelpImportanceLevel(value);
 
-        /// <inheritdoc />
+        /// <summary> Converts a string to a <see cref="SelfHelpImportanceLevel"/>. </summary>
+        /// <param name="value"> The value. </param>
+        public static implicit operator SelfHelpImportanceLevel?(string value) => value == null ? null : new SelfHelpImportanceLevel(value);
+
+        /// <inheritdoc/>
         [EditorBrowsable(EditorBrowsableState.Never)]
         public override bool Equals(object obj) => obj is SelfHelpImportanceLevel other && Equals(other);
-        /// <inheritdoc />
+
+        /// <inheritdoc/>
         public bool Equals(SelfHelpImportanceLevel other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
 
-        /// <inheritdoc />
+        /// <inheritdoc/>
         [EditorBrowsable(EditorBrowsableState.Never)]
         public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
-        /// <inheritdoc />
+
+        /// <inheritdoc/>
         public override string ToString() => _value;
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpName.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpName.cs
index 69a510f175a3..77f61637bdf7 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpName.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpName.cs
@@ -7,6 +7,7 @@
 
 using System;
 using System.ComponentModel;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
@@ -14,41 +15,59 @@ namespace Azure.ResourceManager.SelfHelp.Models
     public readonly partial struct SelfHelpName : IEquatable<SelfHelpName>
     {
         private readonly string _value;
+        private const string SolutionIdValue = "SolutionId";
+        private const string ProblemClassificationIdValue = "ProblemClassificationId";
+        private const string ReplacementKeyValue = "ReplacementKey";
 
         /// <summary> Initializes a new instance of <see cref="SelfHelpName"/>. </summary>
+        /// <param name="value"> The value. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
         public SelfHelpName(string value)
         {
-            _value = value ?? throw new ArgumentNullException(nameof(value));
-        }
+            Argument.AssertNotNull(value, nameof(value));
 
-        private const string SolutionIdValue = "SolutionId";
-        private const string ProblemClassificationIdValue = "ProblemClassificationId";
-        private const string ReplacementKeyValue = "ReplacementKey";
+            _value = value;
+        }
 
-        /// <summary> SolutionId. </summary>
+        /// <summary> Gets the SolutionId. </summary>
         public static SelfHelpName SolutionId { get; } = new SelfHelpName(SolutionIdValue);
-        /// <summary> ProblemClassificationId. </summary>
+
+        /// <summary> Gets the ProblemClassificationId. </summary>
         public static SelfHelpName ProblemClassificationId { get; } = new SelfHelpName(ProblemClassificationIdValue);
-        /// <summary> ReplacementKey. </summary>
+
+        /// <summary> Gets the ReplacementKey. </summary>
         public static SelfHelpName ReplacementKey { get; } = new SelfHelpName(ReplacementKeyValue);
+
         /// <summary> Determines if two <see cref="SelfHelpName"/> values are the same. </summary>
+        /// <param name="left"> The left value to compare. </param>
+        /// <param name="right"> The right value to compare. </param>
         public static bool operator ==(SelfHelpName left, SelfHelpName right) => left.Equals(right);
+
         /// <summary> Determines if two <see cref="SelfHelpName"/> values are not the same. </summary>
+        /// <param name="left"> The left value to compare. </param>
+        /// <param name="right"> The right value to compare. </param>
         public static bool operator !=(SelfHelpName left, SelfHelpName right) => !left.Equals(right);
-        /// <summary> Converts a <see cref="string"/> to a <see cref="SelfHelpName"/>. </summary>
+
+        /// <summary> Converts a string to a <see cref="SelfHelpName"/>. </summary>
+        /// <param name="value"> The value. </param>
         public static implicit operator SelfHelpName(string value) => new SelfHelpName(value);
 
-        /// <inheritdoc />
+        /// <summary> Converts a string to a <see cref="SelfHelpName"/>. </summary>
+        /// <param name="value"> The value. </param>
+        public static implicit operator SelfHelpName?(string value) => value == null ? null : new SelfHelpName(value);
+
+        /// <inheritdoc/>
         [EditorBrowsable(EditorBrowsableState.Never)]
         public override bool Equals(object obj) => obj is SelfHelpName other && Equals(other);
-        /// <inheritdoc />
+
+        /// <inheritdoc/>
         public bool Equals(SelfHelpName other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
 
-        /// <inheritdoc />
+        /// <inheritdoc/>
         [EditorBrowsable(EditorBrowsableState.Never)]
         public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
-        /// <inheritdoc />
+
+        /// <inheritdoc/>
         public override string ToString() => _value;
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpNameAvailabilityContent.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpNameAvailabilityContent.Serialization.cs
deleted file mode 100644
index 17774c3051e8..000000000000
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpNameAvailabilityContent.Serialization.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.ResourceManager.SelfHelp.Models
-{
-    public partial class SelfHelpNameAvailabilityContent : IUtf8JsonSerializable, IJsonModel<SelfHelpNameAvailabilityContent>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<SelfHelpNameAvailabilityContent>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<SelfHelpNameAvailabilityContent>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpNameAvailabilityContent>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(SelfHelpNameAvailabilityContent)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(ResourceName))
-            {
-                writer.WritePropertyName("name"u8);
-                writer.WriteStringValue(ResourceName);
-            }
-            if (Optional.IsDefined(ResourceType))
-            {
-                writer.WritePropertyName("type"u8);
-                writer.WriteStringValue(ResourceType.Value);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value, ModelSerializationExtensions.JsonDocumentOptions))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        SelfHelpNameAvailabilityContent IJsonModel<SelfHelpNameAvailabilityContent>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpNameAvailabilityContent>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(SelfHelpNameAvailabilityContent)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeSelfHelpNameAvailabilityContent(document.RootElement, options);
-        }
-
-        internal static SelfHelpNameAvailabilityContent DeserializeSelfHelpNameAvailabilityContent(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string name = default;
-            ResourceType? type = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("name"u8))
-                {
-                    name = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("type"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    type = new ResourceType(property.Value.GetString());
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new SelfHelpNameAvailabilityContent(name, type, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<SelfHelpNameAvailabilityContent>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpNameAvailabilityContent>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options, AzureResourceManagerSelfHelpContext.Default);
-                default:
-                    throw new FormatException($"The model {nameof(SelfHelpNameAvailabilityContent)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        SelfHelpNameAvailabilityContent IPersistableModel<SelfHelpNameAvailabilityContent>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpNameAvailabilityContent>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
-                        return DeserializeSelfHelpNameAvailabilityContent(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(SelfHelpNameAvailabilityContent)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<SelfHelpNameAvailabilityContent>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-    }
-}
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpNameAvailabilityContent.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpNameAvailabilityContent.cs
deleted file mode 100644
index 933d1df8c907..000000000000
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpNameAvailabilityContent.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-using Azure.Core;
-
-namespace Azure.ResourceManager.SelfHelp.Models
-{
-    /// <summary> The check availability request body. </summary>
-    public partial class SelfHelpNameAvailabilityContent
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="SelfHelpNameAvailabilityContent"/>. </summary>
-        public SelfHelpNameAvailabilityContent()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SelfHelpNameAvailabilityContent"/>. </summary>
-        /// <param name="resourceName"> The name of the resource for which availability needs to be checked. </param>
-        /// <param name="resourceType"> The resource type. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal SelfHelpNameAvailabilityContent(string resourceName, ResourceType? resourceType, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            ResourceName = resourceName;
-            ResourceType = resourceType;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> The name of the resource for which availability needs to be checked. </summary>
-        public string ResourceName { get; set; }
-        /// <summary> The resource type. </summary>
-        public ResourceType? ResourceType { get; set; }
-    }
-}
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpNameAvailabilityResult.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpNameAvailabilityResult.Serialization.cs
deleted file mode 100644
index 90895389ed45..000000000000
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpNameAvailabilityResult.Serialization.cs
+++ /dev/null
@@ -1,155 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using Azure.Core;
-
-namespace Azure.ResourceManager.SelfHelp.Models
-{
-    public partial class SelfHelpNameAvailabilityResult : IUtf8JsonSerializable, IJsonModel<SelfHelpNameAvailabilityResult>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<SelfHelpNameAvailabilityResult>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<SelfHelpNameAvailabilityResult>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpNameAvailabilityResult>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(SelfHelpNameAvailabilityResult)} does not support writing '{format}' format.");
-            }
-
-            if (Optional.IsDefined(IsNameAvailable))
-            {
-                writer.WritePropertyName("nameAvailable"u8);
-                writer.WriteBooleanValue(IsNameAvailable.Value);
-            }
-            if (Optional.IsDefined(Reason))
-            {
-                writer.WritePropertyName("reason"u8);
-                writer.WriteStringValue(Reason);
-            }
-            if (Optional.IsDefined(Message))
-            {
-                writer.WritePropertyName("message"u8);
-                writer.WriteStringValue(Message);
-            }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
-            {
-                foreach (var item in _serializedAdditionalRawData)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value, ModelSerializationExtensions.JsonDocumentOptions))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        SelfHelpNameAvailabilityResult IJsonModel<SelfHelpNameAvailabilityResult>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpNameAvailabilityResult>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(SelfHelpNameAvailabilityResult)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeSelfHelpNameAvailabilityResult(document.RootElement, options);
-        }
-
-        internal static SelfHelpNameAvailabilityResult DeserializeSelfHelpNameAvailabilityResult(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            bool? nameAvailable = default;
-            string reason = default;
-            string message = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("nameAvailable"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    nameAvailable = property.Value.GetBoolean();
-                    continue;
-                }
-                if (property.NameEquals("reason"u8))
-                {
-                    reason = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("message"u8))
-                {
-                    message = property.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new SelfHelpNameAvailabilityResult(nameAvailable, reason, message, serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<SelfHelpNameAvailabilityResult>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpNameAvailabilityResult>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options, AzureResourceManagerSelfHelpContext.Default);
-                default:
-                    throw new FormatException($"The model {nameof(SelfHelpNameAvailabilityResult)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        SelfHelpNameAvailabilityResult IPersistableModel<SelfHelpNameAvailabilityResult>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpNameAvailabilityResult>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
-                        return DeserializeSelfHelpNameAvailabilityResult(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(SelfHelpNameAvailabilityResult)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<SelfHelpNameAvailabilityResult>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-    }
-}
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpNameAvailabilityResult.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpNameAvailabilityResult.cs
deleted file mode 100644
index dbca1b802986..000000000000
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpNameAvailabilityResult.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-
-namespace Azure.ResourceManager.SelfHelp.Models
-{
-    /// <summary> Response for whether the requested resource name is available or not. </summary>
-    public partial class SelfHelpNameAvailabilityResult
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="SelfHelpNameAvailabilityResult"/>. </summary>
-        internal SelfHelpNameAvailabilityResult()
-        {
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SelfHelpNameAvailabilityResult"/>. </summary>
-        /// <param name="isNameAvailable"> Returns true or false depending on the availability of the name. </param>
-        /// <param name="reason"> Reason for why value is not available. This field is returned if nameAvailable is false. </param>
-        /// <param name="message"> Gets an error message explaining the 'reason' value with more details. This field is returned iif nameAvailable is false. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal SelfHelpNameAvailabilityResult(bool? isNameAvailable, string reason, string message, IDictionary<string, BinaryData> serializedAdditionalRawData)
-        {
-            IsNameAvailable = isNameAvailable;
-            Reason = reason;
-            Message = message;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Returns true or false depending on the availability of the name. </summary>
-        public bool? IsNameAvailable { get; }
-        /// <summary> Reason for why value is not available. This field is returned if nameAvailable is false. </summary>
-        public string Reason { get; }
-        /// <summary> Gets an error message explaining the 'reason' value with more details. This field is returned iif nameAvailable is false. </summary>
-        public string Message { get; }
-    }
-}
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpNlpSolutions.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpNlpSolutions.Serialization.cs
new file mode 100644
index 000000000000..87393bf1df3b
--- /dev/null
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpNlpSolutions.Serialization.cs
@@ -0,0 +1,231 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.ResourceManager.SelfHelp;
+
+namespace Azure.ResourceManager.SelfHelp.Models
+{
+    /// <summary> Nlp metadata. </summary>
+    internal partial class SelfHelpNlpSolutions : IJsonModel<SelfHelpNlpSolutions>
+    {
+        /// <param name="writer"> The JSON writer. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        void IJsonModel<SelfHelpNlpSolutions>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            writer.WriteStartObject();
+            JsonModelWriteCore(writer, options);
+            writer.WriteEndObject();
+        }
+
+        /// <param name="writer"> The JSON writer. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpNlpSolutions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(SelfHelpNlpSolutions)} does not support writing '{format}' format.");
+            }
+            if (Optional.IsDefined(ProblemTitle))
+            {
+                writer.WritePropertyName("problemTitle"u8);
+                writer.WriteStringValue(ProblemTitle);
+            }
+            if (Optional.IsDefined(ProblemDescription))
+            {
+                writer.WritePropertyName("problemDescription"u8);
+                writer.WriteStringValue(ProblemDescription);
+            }
+            if (Optional.IsDefined(ServiceId))
+            {
+                writer.WritePropertyName("serviceId"u8);
+                writer.WriteStringValue(ServiceId);
+            }
+            if (Optional.IsDefined(ProblemClassificationId))
+            {
+                writer.WritePropertyName("problemClassificationId"u8);
+                writer.WriteStringValue(ProblemClassificationId);
+            }
+            if (Optional.IsCollectionDefined(Solutions))
+            {
+                writer.WritePropertyName("solutions"u8);
+                writer.WriteStartArray();
+                foreach (SolutionMetadataProperties item in Solutions)
+                {
+                    writer.WriteObjectValue(item, options);
+                }
+                writer.WriteEndArray();
+            }
+            if (Optional.IsCollectionDefined(RelatedServices))
+            {
+                writer.WritePropertyName("relatedServices"u8);
+                writer.WriteStartArray();
+                foreach (ClassificationService item in RelatedServices)
+                {
+                    writer.WriteObjectValue(item, options);
+                }
+                writer.WriteEndArray();
+            }
+            if (options.Format != "W" && _additionalBinaryDataProperties != null)
+            {
+                foreach (var item in _additionalBinaryDataProperties)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+                    writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+        }
+
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        SelfHelpNlpSolutions IJsonModel<SelfHelpNlpSolutions>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options);
+
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual SelfHelpNlpSolutions JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpNlpSolutions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(SelfHelpNlpSolutions)} does not support reading '{format}' format.");
+            }
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeSelfHelpNlpSolutions(document.RootElement, options);
+        }
+
+        /// <param name="element"> The JSON element to deserialize. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        internal static SelfHelpNlpSolutions DeserializeSelfHelpNlpSolutions(JsonElement element, ModelReaderWriterOptions options)
+        {
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string problemTitle = default;
+            string problemDescription = default;
+            string serviceId = default;
+            string problemClassificationId = default;
+            IList<SolutionMetadataProperties> solutions = default;
+            IList<ClassificationService> relatedServices = default;
+            IDictionary<string, BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            foreach (var prop in element.EnumerateObject())
+            {
+                if (prop.NameEquals("problemTitle"u8))
+                {
+                    problemTitle = prop.Value.GetString();
+                    continue;
+                }
+                if (prop.NameEquals("problemDescription"u8))
+                {
+                    problemDescription = prop.Value.GetString();
+                    continue;
+                }
+                if (prop.NameEquals("serviceId"u8))
+                {
+                    serviceId = prop.Value.GetString();
+                    continue;
+                }
+                if (prop.NameEquals("problemClassificationId"u8))
+                {
+                    problemClassificationId = prop.Value.GetString();
+                    continue;
+                }
+                if (prop.NameEquals("solutions"u8))
+                {
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    List<SolutionMetadataProperties> array = new List<SolutionMetadataProperties>();
+                    foreach (var item in prop.Value.EnumerateArray())
+                    {
+                        array.Add(SolutionMetadataProperties.DeserializeSolutionMetadataProperties(item, options));
+                    }
+                    solutions = array;
+                    continue;
+                }
+                if (prop.NameEquals("relatedServices"u8))
+                {
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    List<ClassificationService> array = new List<ClassificationService>();
+                    foreach (var item in prop.Value.EnumerateArray())
+                    {
+                        array.Add(ClassificationService.DeserializeClassificationService(item, options));
+                    }
+                    relatedServices = array;
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText()));
+                }
+            }
+            return new SelfHelpNlpSolutions(
+                problemTitle,
+                problemDescription,
+                serviceId,
+                problemClassificationId,
+                solutions ?? new ChangeTrackingList<SolutionMetadataProperties>(),
+                relatedServices ?? new ChangeTrackingList<ClassificationService>(),
+                additionalBinaryDataProperties);
+        }
+
+        /// <param name="options"> The client options for reading and writing models. </param>
+        BinaryData IPersistableModel<SelfHelpNlpSolutions>.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
+
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpNlpSolutions>)this).GetFormatFromOptions(options) : options.Format;
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options, AzureResourceManagerSelfHelpContext.Default);
+                default:
+                    throw new FormatException($"The model {nameof(SelfHelpNlpSolutions)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        SelfHelpNlpSolutions IPersistableModel<SelfHelpNlpSolutions>.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options);
+
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual SelfHelpNlpSolutions PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpNlpSolutions>)this).GetFormatFromOptions(options) : options.Format;
+            switch (format)
+            {
+                case "J":
+                    using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
+                    {
+                        return DeserializeSelfHelpNlpSolutions(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(SelfHelpNlpSolutions)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        /// <param name="options"> The client options for reading and writing models. </param>
+        string IPersistableModel<SelfHelpNlpSolutions>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+    }
+}
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpNlpSolutions.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpNlpSolutions.cs
new file mode 100644
index 000000000000..2ff24c42025e
--- /dev/null
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpNlpSolutions.cs
@@ -0,0 +1,64 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+using Azure.ResourceManager.SelfHelp;
+
+namespace Azure.ResourceManager.SelfHelp.Models
+{
+    /// <summary> Nlp metadata. </summary>
+    internal partial class SelfHelpNlpSolutions
+    {
+        /// <summary> Keeps track of any properties unknown to the library. </summary>
+        private protected readonly IDictionary<string, BinaryData> _additionalBinaryDataProperties;
+
+        /// <summary> Initializes a new instance of <see cref="SelfHelpNlpSolutions"/>. </summary>
+        public SelfHelpNlpSolutions()
+        {
+            Solutions = new ChangeTrackingList<SolutionMetadataProperties>();
+            RelatedServices = new ChangeTrackingList<ClassificationService>();
+        }
+
+        /// <summary> Initializes a new instance of <see cref="SelfHelpNlpSolutions"/>. </summary>
+        /// <param name="problemTitle"> Title of the problem classification. </param>
+        /// <param name="problemDescription"> Description of the problem classification. </param>
+        /// <param name="serviceId"> Id of the service (https://learn.microsoft.com/en-us/rest/api/support/services?view=rest-support-2020-04-01) that may be used to create a support ticket. </param>
+        /// <param name="problemClassificationId"> Id of the ProblemClassification (https://learn.microsoft.com/en-us/rest/api/support/problem-classifications?view=rest-support-2020-04-01) that may be used to create a support ticket. </param>
+        /// <param name="solutions"> The list of solution metadata. </param>
+        /// <param name="relatedServices"> The set of services that are most likely related to the request. If relatedServices is included in the response then solutions may not be discovered until the client calls a second time specifying one of the service Ids in the relatedServices object. </param>
+        /// <param name="additionalBinaryDataProperties"> Keeps track of any properties unknown to the library. </param>
+        internal SelfHelpNlpSolutions(string problemTitle, string problemDescription, string serviceId, string problemClassificationId, IList<SolutionMetadataProperties> solutions, IList<ClassificationService> relatedServices, IDictionary<string, BinaryData> additionalBinaryDataProperties)
+        {
+            ProblemTitle = problemTitle;
+            ProblemDescription = problemDescription;
+            ServiceId = serviceId;
+            ProblemClassificationId = problemClassificationId;
+            Solutions = solutions;
+            RelatedServices = relatedServices;
+            _additionalBinaryDataProperties = additionalBinaryDataProperties;
+        }
+
+        /// <summary> Title of the problem classification. </summary>
+        public string ProblemTitle { get; set; }
+
+        /// <summary> Description of the problem classification. </summary>
+        public string ProblemDescription { get; set; }
+
+        /// <summary> Id of the service (https://learn.microsoft.com/en-us/rest/api/support/services?view=rest-support-2020-04-01) that may be used to create a support ticket. </summary>
+        public string ServiceId { get; set; }
+
+        /// <summary> Id of the ProblemClassification (https://learn.microsoft.com/en-us/rest/api/support/problem-classifications?view=rest-support-2020-04-01) that may be used to create a support ticket. </summary>
+        public string ProblemClassificationId { get; set; }
+
+        /// <summary> The list of solution metadata. </summary>
+        public IList<SolutionMetadataProperties> Solutions { get; } = new ChangeTrackingList<SolutionMetadataProperties>();
+
+        /// <summary> The set of services that are most likely related to the request. If relatedServices is included in the response then solutions may not be discovered until the client calls a second time specifying one of the service Ids in the relatedServices object. </summary>
+        public IList<ClassificationService> RelatedServices { get; } = new ChangeTrackingList<ClassificationService>();
+    }
+}
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpProvisioningState.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpProvisioningState.cs
index b62503459457..c2eb28de8359 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpProvisioningState.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpProvisioningState.cs
@@ -7,6 +7,7 @@
 
 using System;
 using System.ComponentModel;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
@@ -14,47 +15,72 @@ namespace Azure.ResourceManager.SelfHelp.Models
     public readonly partial struct SelfHelpProvisioningState : IEquatable<SelfHelpProvisioningState>
     {
         private readonly string _value;
+        /// <summary> All Diagnostics in the Batch succeeded. </summary>
+        private const string SucceededValue = "Succeeded";
+        /// <summary> Some Diagnostics are still running or failed. </summary>
+        private const string PartialCompleteValue = "PartialComplete";
+        /// <summary> All Diagnostics failed to run. </summary>
+        private const string FailedValue = "Failed";
+        /// <summary> All Diagnostics are still running. </summary>
+        private const string RunningValue = "Running";
+        /// <summary> When Diagnostic request gets canceled. </summary>
+        private const string CanceledValue = "Canceled";
 
         /// <summary> Initializes a new instance of <see cref="SelfHelpProvisioningState"/>. </summary>
+        /// <param name="value"> The value. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
         public SelfHelpProvisioningState(string value)
         {
-            _value = value ?? throw new ArgumentNullException(nameof(value));
-        }
+            Argument.AssertNotNull(value, nameof(value));
 
-        private const string SucceededValue = "Succeeded";
-        private const string PartialCompleteValue = "PartialComplete";
-        private const string FailedValue = "Failed";
-        private const string RunningValue = "Running";
-        private const string CanceledValue = "Canceled";
+            _value = value;
+        }
 
         /// <summary> All Diagnostics in the Batch succeeded. </summary>
         public static SelfHelpProvisioningState Succeeded { get; } = new SelfHelpProvisioningState(SucceededValue);
+
         /// <summary> Some Diagnostics are still running or failed. </summary>
         public static SelfHelpProvisioningState PartialComplete { get; } = new SelfHelpProvisioningState(PartialCompleteValue);
+
         /// <summary> All Diagnostics failed to run. </summary>
         public static SelfHelpProvisioningState Failed { get; } = new SelfHelpProvisioningState(FailedValue);
+
         /// <summary> All Diagnostics are still running. </summary>
         public static SelfHelpProvisioningState Running { get; } = new SelfHelpProvisioningState(RunningValue);
+
         /// <summary> When Diagnostic request gets canceled. </summary>
         public static SelfHelpProvisioningState Canceled { get; } = new SelfHelpProvisioningState(CanceledValue);
+
         /// <summary> Determines if two <see cref="SelfHelpProvisioningState"/> values are the same. </summary>
+        /// <param name="left"> The left value to compare. </param>
+        /// <param name="right"> The right value to compare. </param>
         public static bool operator ==(SelfHelpProvisioningState left, SelfHelpProvisioningState right) => left.Equals(right);
+
         /// <summary> Determines if two <see cref="SelfHelpProvisioningState"/> values are not the same. </summary>
+        /// <param name="left"> The left value to compare. </param>
+        /// <param name="right"> The right value to compare. </param>
         public static bool operator !=(SelfHelpProvisioningState left, SelfHelpProvisioningState right) => !left.Equals(right);
-        /// <summary> Converts a <see cref="string"/> to a <see cref="SelfHelpProvisioningState"/>. </summary>
+
+        /// <summary> Converts a string to a <see cref="SelfHelpProvisioningState"/>. </summary>
+        /// <param name="value"> The value. </param>
         public static implicit operator SelfHelpProvisioningState(string value) => new SelfHelpProvisioningState(value);
 
-        /// <inheritdoc />
+        /// <summary> Converts a string to a <see cref="SelfHelpProvisioningState"/>. </summary>
+        /// <param name="value"> The value. </param>
+        public static implicit operator SelfHelpProvisioningState?(string value) => value == null ? null : new SelfHelpProvisioningState(value);
+
+        /// <inheritdoc/>
         [EditorBrowsable(EditorBrowsableState.Never)]
         public override bool Equals(object obj) => obj is SelfHelpProvisioningState other && Equals(other);
-        /// <inheritdoc />
+
+        /// <inheritdoc/>
         public bool Equals(SelfHelpProvisioningState other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
 
-        /// <inheritdoc />
+        /// <inheritdoc/>
         [EditorBrowsable(EditorBrowsableState.Never)]
         public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
-        /// <inheritdoc />
+
+        /// <inheritdoc/>
         public override string ToString() => _value;
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpSection.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpSection.Serialization.cs
index 78b68f2b5384..dc92da13d150 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpSection.Serialization.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpSection.Serialization.cs
@@ -9,14 +9,15 @@
 using System.ClientModel.Primitives;
 using System.Collections.Generic;
 using System.Text.Json;
-using Azure.Core;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
-    public partial class SelfHelpSection : IUtf8JsonSerializable, IJsonModel<SelfHelpSection>
+    /// <summary> Part of the solution and are dividers in the solution rendering. </summary>
+    public partial class SelfHelpSection : IJsonModel<SelfHelpSection>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<SelfHelpSection>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
+        /// <param name="writer"> The JSON writer. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
         void IJsonModel<SelfHelpSection>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
@@ -28,12 +29,11 @@ void IJsonModel<SelfHelpSection>.Write(Utf8JsonWriter writer, ModelReaderWriterO
         /// <param name="options"> The client options for reading and writing models. </param>
         protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpSection>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpSection>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(SelfHelpSection)} does not support writing '{format}' format.");
             }
-
             if (Optional.IsDefined(Title))
             {
                 writer.WritePropertyName("title"u8);
@@ -49,15 +49,15 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
                 writer.WritePropertyName("replacementMaps"u8);
                 writer.WriteObjectValue(ReplacementMaps, options);
             }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            if (options.Format != "W" && _additionalBinaryDataProperties != null)
             {
-                foreach (var item in _serializedAdditionalRawData)
+                foreach (var item in _additionalBinaryDataProperties)
                 {
                     writer.WritePropertyName(item.Key);
 #if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
+                    writer.WriteRawValue(item.Value);
 #else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value, ModelSerializationExtensions.JsonDocumentOptions))
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
                     {
                         JsonSerializer.Serialize(writer, document.RootElement);
                     }
@@ -66,22 +66,27 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             }
         }
 
-        SelfHelpSection IJsonModel<SelfHelpSection>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        SelfHelpSection IJsonModel<SelfHelpSection>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options);
+
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual SelfHelpSection JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpSection>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpSection>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(SelfHelpSection)} does not support reading '{format}' format.");
             }
-
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
             return DeserializeSelfHelpSection(document.RootElement, options);
         }
 
-        internal static SelfHelpSection DeserializeSelfHelpSection(JsonElement element, ModelReaderWriterOptions options = null)
+        /// <param name="element"> The JSON element to deserialize. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        internal static SelfHelpSection DeserializeSelfHelpSection(JsonElement element, ModelReaderWriterOptions options)
         {
-            options ??= ModelSerializationExtensions.WireOptions;
-
             if (element.ValueKind == JsonValueKind.Null)
             {
                 return null;
@@ -89,42 +94,43 @@ internal static SelfHelpSection DeserializeSelfHelpSection(JsonElement element,
             string title = default;
             string content = default;
             SolutionReplacementMaps replacementMaps = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
+            IDictionary<string, BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            foreach (var prop in element.EnumerateObject())
             {
-                if (property.NameEquals("title"u8))
+                if (prop.NameEquals("title"u8))
                 {
-                    title = property.Value.GetString();
+                    title = prop.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("content"u8))
+                if (prop.NameEquals("content"u8))
                 {
-                    content = property.Value.GetString();
+                    content = prop.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("replacementMaps"u8))
+                if (prop.NameEquals("replacementMaps"u8))
                 {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
-                    replacementMaps = SolutionReplacementMaps.DeserializeSolutionReplacementMaps(property.Value, options);
+                    replacementMaps = SolutionReplacementMaps.DeserializeSolutionReplacementMaps(prop.Value, options);
                     continue;
                 }
                 if (options.Format != "W")
                 {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                    additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText()));
                 }
             }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new SelfHelpSection(title, content, replacementMaps, serializedAdditionalRawData);
+            return new SelfHelpSection(title, content, replacementMaps, additionalBinaryDataProperties);
         }
 
-        BinaryData IPersistableModel<SelfHelpSection>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpSection>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="options"> The client options for reading and writing models. </param>
+        BinaryData IPersistableModel<SelfHelpSection>.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
 
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpSection>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
@@ -134,15 +140,20 @@ BinaryData IPersistableModel<SelfHelpSection>.Write(ModelReaderWriterOptions opt
             }
         }
 
-        SelfHelpSection IPersistableModel<SelfHelpSection>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpSection>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        SelfHelpSection IPersistableModel<SelfHelpSection>.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options);
 
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual SelfHelpSection PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpSection>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
+                    using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
                     {
-                        using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
                         return DeserializeSelfHelpSection(document.RootElement, options);
                     }
                 default:
@@ -150,6 +161,7 @@ SelfHelpSection IPersistableModel<SelfHelpSection>.Create(BinaryData data, Model
             }
         }
 
+        /// <param name="options"> The client options for reading and writing models. </param>
         string IPersistableModel<SelfHelpSection>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpSection.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpSection.cs
index 4774398ddfc4..9048b831b424 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpSection.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpSection.cs
@@ -13,37 +13,8 @@ namespace Azure.ResourceManager.SelfHelp.Models
     /// <summary> Part of the solution and are dividers in the solution rendering. </summary>
     public partial class SelfHelpSection
     {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+        /// <summary> Keeps track of any properties unknown to the library. </summary>
+        private protected readonly IDictionary<string, BinaryData> _additionalBinaryDataProperties;
 
         /// <summary> Initializes a new instance of <see cref="SelfHelpSection"/>. </summary>
         internal SelfHelpSection()
@@ -54,19 +25,21 @@ internal SelfHelpSection()
         /// <param name="title"> Solution sections title. </param>
         /// <param name="content"> Solution sections content. </param>
         /// <param name="replacementMaps"> Solution replacement maps. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal SelfHelpSection(string title, string content, SolutionReplacementMaps replacementMaps, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        /// <param name="additionalBinaryDataProperties"> Keeps track of any properties unknown to the library. </param>
+        internal SelfHelpSection(string title, string content, SolutionReplacementMaps replacementMaps, IDictionary<string, BinaryData> additionalBinaryDataProperties)
         {
             Title = title;
             Content = content;
             ReplacementMaps = replacementMaps;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
+            _additionalBinaryDataProperties = additionalBinaryDataProperties;
         }
 
         /// <summary> Solution sections title. </summary>
         public string Title { get; }
+
         /// <summary> Solution sections content. </summary>
         public string Content { get; }
+
         /// <summary> Solution replacement maps. </summary>
         public SolutionReplacementMaps ReplacementMaps { get; }
     }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpSolutionMetadata.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpSolutionMetadata.Serialization.cs
index 90f98ade4e0c..d1622abf5ff1 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpSolutionMetadata.Serialization.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpSolutionMetadata.Serialization.cs
@@ -12,11 +12,15 @@
 using System.Text.Json;
 using Azure.Core;
 using Azure.ResourceManager.Models;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
-    public partial class SelfHelpSolutionMetadata : IUtf8JsonSerializable, IJsonModel<SelfHelpSolutionMetadata>
+    /// <summary> Metadata resource. </summary>
+    public partial class SelfHelpSolutionMetadata : ResourceData, IJsonModel<SelfHelpSolutionMetadata>
     {
+        /// <param name="writer"> The JSON writer. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
         void IJsonModel<SelfHelpSolutionMetadata>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
@@ -28,126 +32,114 @@ void IJsonModel<SelfHelpSolutionMetadata>.Write(Utf8JsonWriter writer, ModelRead
         /// <param name="options"> The client options for reading and writing models. </param>
         protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpSolutionMetadata>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpSolutionMetadata>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(SelfHelpSolutionMetadata)} does not support writing '{format}' format.");
             }
-
             base.JsonModelWriteCore(writer, options);
-            writer.WritePropertyName("properties"u8);
-            writer.WriteStartObject();
-            if (Optional.IsCollectionDefined(Solutions))
+            if (Optional.IsDefined(Properties))
             {
-                writer.WritePropertyName("solutions"u8);
-                writer.WriteStartArray();
-                foreach (var item in Solutions)
-                {
-                    writer.WriteObjectValue(item, options);
-                }
-                writer.WriteEndArray();
+                writer.WritePropertyName("properties"u8);
+                writer.WriteObjectValue(Properties, options);
             }
-            writer.WriteEndObject();
         }
 
-        SelfHelpSolutionMetadata IJsonModel<SelfHelpSolutionMetadata>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        SelfHelpSolutionMetadata IJsonModel<SelfHelpSolutionMetadata>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => (SelfHelpSolutionMetadata)JsonModelCreateCore(ref reader, options);
+
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual ResourceData JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpSolutionMetadata>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpSolutionMetadata>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(SelfHelpSolutionMetadata)} does not support reading '{format}' format.");
             }
-
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
             return DeserializeSelfHelpSolutionMetadata(document.RootElement, options);
         }
 
-        internal static SelfHelpSolutionMetadata DeserializeSelfHelpSolutionMetadata(JsonElement element, ModelReaderWriterOptions options = null)
+        /// <param name="element"> The JSON element to deserialize. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        internal static SelfHelpSolutionMetadata DeserializeSelfHelpSolutionMetadata(JsonElement element, ModelReaderWriterOptions options)
         {
-            options ??= ModelSerializationExtensions.WireOptions;
-
             if (element.ValueKind == JsonValueKind.Null)
             {
                 return null;
             }
             ResourceIdentifier id = default;
             string name = default;
-            ResourceType type = default;
+            ResourceType resourceType = default;
             SystemData systemData = default;
-            IList<SolutionMetadataProperties> solutions = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
+            IDictionary<string, BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            SelfHelpSolutions properties = default;
+            foreach (var prop in element.EnumerateObject())
             {
-                if (property.NameEquals("id"u8))
+                if (prop.NameEquals("id"u8))
                 {
-                    id = new ResourceIdentifier(property.Value.GetString());
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    id = new ResourceIdentifier(prop.Value.GetString());
                     continue;
                 }
-                if (property.NameEquals("name"u8))
+                if (prop.NameEquals("name"u8))
                 {
-                    name = property.Value.GetString();
+                    name = prop.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("type"u8))
+                if (prop.NameEquals("type"u8))
                 {
-                    type = new ResourceType(property.Value.GetString());
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    resourceType = new ResourceType(prop.Value.GetString());
                     continue;
                 }
-                if (property.NameEquals("systemData"u8))
+                if (prop.NameEquals("systemData"u8))
                 {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
-                    systemData = ModelReaderWriter.Read<SystemData>(new BinaryData(Encoding.UTF8.GetBytes(property.Value.GetRawText())), ModelSerializationExtensions.WireOptions, AzureResourceManagerSelfHelpContext.Default);
+                    systemData = ModelReaderWriter.Read<SystemData>(new BinaryData(Encoding.UTF8.GetBytes(prop.Value.GetRawText())), ModelSerializationExtensions.WireOptions, AzureResourceManagerSelfHelpContext.Default);
                     continue;
                 }
-                if (property.NameEquals("properties"u8))
+                if (prop.NameEquals("properties"u8))
                 {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
-                        property.ThrowNonNullablePropertyIsNull();
                         continue;
                     }
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        if (property0.NameEquals("solutions"u8))
-                        {
-                            if (property0.Value.ValueKind == JsonValueKind.Null)
-                            {
-                                continue;
-                            }
-                            List<SolutionMetadataProperties> array = new List<SolutionMetadataProperties>();
-                            foreach (var item in property0.Value.EnumerateArray())
-                            {
-                                array.Add(SolutionMetadataProperties.DeserializeSolutionMetadataProperties(item, options));
-                            }
-                            solutions = array;
-                            continue;
-                        }
-                    }
+                    properties = SelfHelpSolutions.DeserializeSelfHelpSolutions(prop.Value, options);
                     continue;
                 }
                 if (options.Format != "W")
                 {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                    additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText()));
                 }
             }
-            serializedAdditionalRawData = rawDataDictionary;
             return new SelfHelpSolutionMetadata(
                 id,
                 name,
-                type,
+                resourceType,
                 systemData,
-                solutions ?? new ChangeTrackingList<SolutionMetadataProperties>(),
-                serializedAdditionalRawData);
+                additionalBinaryDataProperties,
+                properties);
         }
 
-        BinaryData IPersistableModel<SelfHelpSolutionMetadata>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpSolutionMetadata>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="options"> The client options for reading and writing models. </param>
+        BinaryData IPersistableModel<SelfHelpSolutionMetadata>.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
 
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpSolutionMetadata>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
@@ -157,15 +149,20 @@ BinaryData IPersistableModel<SelfHelpSolutionMetadata>.Write(ModelReaderWriterOp
             }
         }
 
-        SelfHelpSolutionMetadata IPersistableModel<SelfHelpSolutionMetadata>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpSolutionMetadata>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        SelfHelpSolutionMetadata IPersistableModel<SelfHelpSolutionMetadata>.Create(BinaryData data, ModelReaderWriterOptions options) => (SelfHelpSolutionMetadata)PersistableModelCreateCore(data, options);
 
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual ResourceData PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpSolutionMetadata>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
+                    using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
                     {
-                        using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
                         return DeserializeSelfHelpSolutionMetadata(document.RootElement, options);
                     }
                 default:
@@ -173,6 +170,7 @@ SelfHelpSolutionMetadata IPersistableModel<SelfHelpSolutionMetadata>.Create(Bina
             }
         }
 
+        /// <param name="options"> The client options for reading and writing models. </param>
         string IPersistableModel<SelfHelpSolutionMetadata>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpSolutionMetadata.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpSolutionMetadata.cs
index 8d6d12d8ef18..52546fb758f1 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpSolutionMetadata.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpSolutionMetadata.cs
@@ -15,58 +15,41 @@ namespace Azure.ResourceManager.SelfHelp.Models
     /// <summary> Metadata resource. </summary>
     public partial class SelfHelpSolutionMetadata : ResourceData
     {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+        /// <summary> Keeps track of any properties unknown to the library. </summary>
+        private protected readonly IDictionary<string, BinaryData> _additionalBinaryDataProperties;
 
         /// <summary> Initializes a new instance of <see cref="SelfHelpSolutionMetadata"/>. </summary>
         public SelfHelpSolutionMetadata()
         {
-            Solutions = new ChangeTrackingList<SolutionMetadataProperties>();
         }
 
         /// <summary> Initializes a new instance of <see cref="SelfHelpSolutionMetadata"/>. </summary>
-        /// <param name="id"> The id. </param>
-        /// <param name="name"> The name. </param>
-        /// <param name="resourceType"> The resourceType. </param>
-        /// <param name="systemData"> The systemData. </param>
-        /// <param name="solutions"> List of metadata. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal SelfHelpSolutionMetadata(ResourceIdentifier id, string name, ResourceType resourceType, SystemData systemData, IList<SolutionMetadataProperties> solutions, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(id, name, resourceType, systemData)
+        /// <param name="id"> Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. </param>
+        /// <param name="name"> The name of the resource. </param>
+        /// <param name="resourceType"> The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts". </param>
+        /// <param name="systemData"> Azure Resource Manager metadata containing createdBy and modifiedBy information. </param>
+        /// <param name="additionalBinaryDataProperties"> Keeps track of any properties unknown to the library. </param>
+        /// <param name="properties"> Solution metadata Resource properties. </param>
+        internal SelfHelpSolutionMetadata(ResourceIdentifier id, string name, ResourceType resourceType, SystemData systemData, IDictionary<string, BinaryData> additionalBinaryDataProperties, SelfHelpSolutions properties) : base(id, name, resourceType, systemData)
         {
-            Solutions = solutions;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
+            _additionalBinaryDataProperties = additionalBinaryDataProperties;
+            Properties = properties;
         }
 
+        /// <summary> Solution metadata Resource properties. </summary>
+        internal SelfHelpSolutions Properties { get; set; }
+
         /// <summary> List of metadata. </summary>
-        public IList<SolutionMetadataProperties> Solutions { get; }
+        public IList<SolutionMetadataProperties> Solutions
+        {
+            get
+            {
+                if (Properties is null)
+                {
+                    Properties = new SelfHelpSolutions();
+                }
+                return Properties.Solutions;
+            }
+        }
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpSolutionPatch.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpSolutionPatch.Serialization.cs
index 76c29830be30..63b3be74bc42 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpSolutionPatch.Serialization.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpSolutionPatch.Serialization.cs
@@ -10,13 +10,15 @@
 using System.Collections.Generic;
 using System.Text.Json;
 using Azure.Core;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
-    public partial class SelfHelpSolutionPatch : IUtf8JsonSerializable, IJsonModel<SelfHelpSolutionPatch>
+    /// <summary> Solution PatchRequest body. </summary>
+    public partial class SelfHelpSolutionPatch : IJsonModel<SelfHelpSolutionPatch>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<SelfHelpSolutionPatch>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
+        /// <param name="writer"> The JSON writer. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
         void IJsonModel<SelfHelpSolutionPatch>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
@@ -28,80 +30,25 @@ void IJsonModel<SelfHelpSolutionPatch>.Write(Utf8JsonWriter writer, ModelReaderW
         /// <param name="options"> The client options for reading and writing models. </param>
         protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpSolutionPatch>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpSolutionPatch>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(SelfHelpSolutionPatch)} does not support writing '{format}' format.");
             }
-
-            writer.WritePropertyName("properties"u8);
-            writer.WriteStartObject();
-            if (Optional.IsCollectionDefined(TriggerCriteria))
+            if (Optional.IsDefined(Properties))
             {
-                writer.WritePropertyName("triggerCriteria"u8);
-                writer.WriteStartArray();
-                foreach (var item in TriggerCriteria)
-                {
-                    writer.WriteObjectValue(item, options);
-                }
-                writer.WriteEndArray();
-            }
-            if (Optional.IsCollectionDefined(Parameters))
-            {
-                writer.WritePropertyName("parameters"u8);
-                writer.WriteStartObject();
-                foreach (var item in Parameters)
-                {
-                    writer.WritePropertyName(item.Key);
-                    writer.WriteStringValue(item.Value);
-                }
-                writer.WriteEndObject();
-            }
-            if (options.Format != "W" && Optional.IsDefined(SolutionId))
-            {
-                writer.WritePropertyName("solutionId"u8);
-                writer.WriteStringValue(SolutionId);
-            }
-            if (options.Format != "W" && Optional.IsDefined(ProvisioningState))
-            {
-                writer.WritePropertyName("provisioningState"u8);
-                writer.WriteStringValue(ProvisioningState.Value.ToString());
-            }
-            if (options.Format != "W" && Optional.IsDefined(Title))
-            {
-                writer.WritePropertyName("title"u8);
-                writer.WriteStringValue(Title);
-            }
-            if (options.Format != "W" && Optional.IsDefined(Content))
-            {
-                writer.WritePropertyName("content"u8);
-                writer.WriteStringValue(Content);
-            }
-            if (options.Format != "W" && Optional.IsDefined(ReplacementMaps))
-            {
-                writer.WritePropertyName("replacementMaps"u8);
-                writer.WriteObjectValue(ReplacementMaps, options);
-            }
-            if (options.Format != "W" && Optional.IsCollectionDefined(Sections))
-            {
-                writer.WritePropertyName("sections"u8);
-                writer.WriteStartArray();
-                foreach (var item in Sections)
-                {
-                    writer.WriteObjectValue(item, options);
-                }
-                writer.WriteEndArray();
+                writer.WritePropertyName("properties"u8);
+                writer.WriteObjectValue(Properties, options);
             }
-            writer.WriteEndObject();
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            if (options.Format != "W" && _additionalBinaryDataProperties != null)
             {
-                foreach (var item in _serializedAdditionalRawData)
+                foreach (var item in _additionalBinaryDataProperties)
                 {
                     writer.WritePropertyName(item.Key);
 #if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
+                    writer.WriteRawValue(item.Value);
 #else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value, ModelSerializationExtensions.JsonDocumentOptions))
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
                     {
                         JsonSerializer.Serialize(writer, document.RootElement);
                     }
@@ -110,147 +57,59 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             }
         }
 
-        SelfHelpSolutionPatch IJsonModel<SelfHelpSolutionPatch>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        SelfHelpSolutionPatch IJsonModel<SelfHelpSolutionPatch>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options);
+
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual SelfHelpSolutionPatch JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpSolutionPatch>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpSolutionPatch>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(SelfHelpSolutionPatch)} does not support reading '{format}' format.");
             }
-
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
             return DeserializeSelfHelpSolutionPatch(document.RootElement, options);
         }
 
-        internal static SelfHelpSolutionPatch DeserializeSelfHelpSolutionPatch(JsonElement element, ModelReaderWriterOptions options = null)
+        /// <param name="element"> The JSON element to deserialize. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        internal static SelfHelpSolutionPatch DeserializeSelfHelpSolutionPatch(JsonElement element, ModelReaderWriterOptions options)
         {
-            options ??= ModelSerializationExtensions.WireOptions;
-
             if (element.ValueKind == JsonValueKind.Null)
             {
                 return null;
             }
-            IList<SolutionTriggerCriterion> triggerCriteria = default;
-            IDictionary<string, string> parameters = default;
-            string solutionId = default;
-            SolutionProvisioningState? provisioningState = default;
-            string title = default;
-            string content = default;
-            SolutionReplacementMaps replacementMaps = default;
-            IReadOnlyList<SelfHelpSection> sections = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
+            SolutionResourceProperties properties = default;
+            IDictionary<string, BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            foreach (var prop in element.EnumerateObject())
             {
-                if (property.NameEquals("properties"u8))
+                if (prop.NameEquals("properties"u8))
                 {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
-                        property.ThrowNonNullablePropertyIsNull();
                         continue;
                     }
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        if (property0.NameEquals("triggerCriteria"u8))
-                        {
-                            if (property0.Value.ValueKind == JsonValueKind.Null)
-                            {
-                                continue;
-                            }
-                            List<SolutionTriggerCriterion> array = new List<SolutionTriggerCriterion>();
-                            foreach (var item in property0.Value.EnumerateArray())
-                            {
-                                array.Add(SolutionTriggerCriterion.DeserializeSolutionTriggerCriterion(item, options));
-                            }
-                            triggerCriteria = array;
-                            continue;
-                        }
-                        if (property0.NameEquals("parameters"u8))
-                        {
-                            if (property0.Value.ValueKind == JsonValueKind.Null)
-                            {
-                                continue;
-                            }
-                            Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                            foreach (var property1 in property0.Value.EnumerateObject())
-                            {
-                                dictionary.Add(property1.Name, property1.Value.GetString());
-                            }
-                            parameters = dictionary;
-                            continue;
-                        }
-                        if (property0.NameEquals("solutionId"u8))
-                        {
-                            solutionId = property0.Value.GetString();
-                            continue;
-                        }
-                        if (property0.NameEquals("provisioningState"u8))
-                        {
-                            if (property0.Value.ValueKind == JsonValueKind.Null)
-                            {
-                                continue;
-                            }
-                            provisioningState = new SolutionProvisioningState(property0.Value.GetString());
-                            continue;
-                        }
-                        if (property0.NameEquals("title"u8))
-                        {
-                            title = property0.Value.GetString();
-                            continue;
-                        }
-                        if (property0.NameEquals("content"u8))
-                        {
-                            content = property0.Value.GetString();
-                            continue;
-                        }
-                        if (property0.NameEquals("replacementMaps"u8))
-                        {
-                            if (property0.Value.ValueKind == JsonValueKind.Null)
-                            {
-                                continue;
-                            }
-                            replacementMaps = SolutionReplacementMaps.DeserializeSolutionReplacementMaps(property0.Value, options);
-                            continue;
-                        }
-                        if (property0.NameEquals("sections"u8))
-                        {
-                            if (property0.Value.ValueKind == JsonValueKind.Null)
-                            {
-                                continue;
-                            }
-                            List<SelfHelpSection> array = new List<SelfHelpSection>();
-                            foreach (var item in property0.Value.EnumerateArray())
-                            {
-                                array.Add(SelfHelpSection.DeserializeSelfHelpSection(item, options));
-                            }
-                            sections = array;
-                            continue;
-                        }
-                    }
+                    properties = SolutionResourceProperties.DeserializeSolutionResourceProperties(prop.Value, options);
                     continue;
                 }
                 if (options.Format != "W")
                 {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                    additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText()));
                 }
             }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new SelfHelpSolutionPatch(
-                triggerCriteria ?? new ChangeTrackingList<SolutionTriggerCriterion>(),
-                parameters ?? new ChangeTrackingDictionary<string, string>(),
-                solutionId,
-                provisioningState,
-                title,
-                content,
-                replacementMaps,
-                sections ?? new ChangeTrackingList<SelfHelpSection>(),
-                serializedAdditionalRawData);
+            return new SelfHelpSolutionPatch(properties, additionalBinaryDataProperties);
         }
 
-        BinaryData IPersistableModel<SelfHelpSolutionPatch>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpSolutionPatch>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="options"> The client options for reading and writing models. </param>
+        BinaryData IPersistableModel<SelfHelpSolutionPatch>.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
 
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpSolutionPatch>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
@@ -260,15 +119,20 @@ BinaryData IPersistableModel<SelfHelpSolutionPatch>.Write(ModelReaderWriterOptio
             }
         }
 
-        SelfHelpSolutionPatch IPersistableModel<SelfHelpSolutionPatch>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpSolutionPatch>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        SelfHelpSolutionPatch IPersistableModel<SelfHelpSolutionPatch>.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options);
 
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual SelfHelpSolutionPatch PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpSolutionPatch>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
+                    using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
                     {
-                        using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
                         return DeserializeSelfHelpSolutionPatch(document.RootElement, options);
                     }
                 default:
@@ -276,6 +140,19 @@ SelfHelpSolutionPatch IPersistableModel<SelfHelpSolutionPatch>.Create(BinaryData
             }
         }
 
+        /// <param name="options"> The client options for reading and writing models. </param>
         string IPersistableModel<SelfHelpSolutionPatch>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <param name="selfHelpSolutionPatch"> The <see cref="SelfHelpSolutionPatch"/> to serialize into <see cref="RequestContent"/>. </param>
+        internal static RequestContent ToRequestContent(SelfHelpSolutionPatch selfHelpSolutionPatch)
+        {
+            if (selfHelpSolutionPatch == null)
+            {
+                return null;
+            }
+            Utf8JsonRequestContent content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(selfHelpSolutionPatch, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpSolutionPatch.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpSolutionPatch.cs
index a195e255bc57..64ce4ac2e762 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpSolutionPatch.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpSolutionPatch.cs
@@ -13,84 +13,108 @@ namespace Azure.ResourceManager.SelfHelp.Models
     /// <summary> Solution PatchRequest body. </summary>
     public partial class SelfHelpSolutionPatch
     {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+        /// <summary> Keeps track of any properties unknown to the library. </summary>
+        private protected readonly IDictionary<string, BinaryData> _additionalBinaryDataProperties;
 
         /// <summary> Initializes a new instance of <see cref="SelfHelpSolutionPatch"/>. </summary>
         public SelfHelpSolutionPatch()
         {
-            TriggerCriteria = new ChangeTrackingList<SolutionTriggerCriterion>();
-            Parameters = new ChangeTrackingDictionary<string, string>();
-            Sections = new ChangeTrackingList<SelfHelpSection>();
         }
 
         /// <summary> Initializes a new instance of <see cref="SelfHelpSolutionPatch"/>. </summary>
-        /// <param name="triggerCriteria"> Solution request trigger criteria. </param>
-        /// <param name="parameters"> Client input parameters to run Solution. </param>
-        /// <param name="solutionId"> Solution Id to identify single solution. </param>
-        /// <param name="provisioningState"> Status of solution provisioning. </param>
-        /// <param name="title"> The title. </param>
-        /// <param name="content"> The HTML content that needs to be rendered and shown to customer. </param>
-        /// <param name="replacementMaps"> Solution replacement maps. </param>
-        /// <param name="sections"> List of section object. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal SelfHelpSolutionPatch(IList<SolutionTriggerCriterion> triggerCriteria, IDictionary<string, string> parameters, string solutionId, SolutionProvisioningState? provisioningState, string title, string content, SolutionReplacementMaps replacementMaps, IReadOnlyList<SelfHelpSection> sections, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        /// <param name="properties"> Solution result. </param>
+        /// <param name="additionalBinaryDataProperties"> Keeps track of any properties unknown to the library. </param>
+        internal SelfHelpSolutionPatch(SolutionResourceProperties properties, IDictionary<string, BinaryData> additionalBinaryDataProperties)
         {
-            TriggerCriteria = triggerCriteria;
-            Parameters = parameters;
-            SolutionId = solutionId;
-            ProvisioningState = provisioningState;
-            Title = title;
-            Content = content;
-            ReplacementMaps = replacementMaps;
-            Sections = sections;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
+            Properties = properties;
+            _additionalBinaryDataProperties = additionalBinaryDataProperties;
         }
 
+        /// <summary> Solution result. </summary>
+        internal SolutionResourceProperties Properties { get; set; }
+
         /// <summary> Solution request trigger criteria. </summary>
-        public IList<SolutionTriggerCriterion> TriggerCriteria { get; }
+        public IList<SolutionTriggerCriterion> TriggerCriteria
+        {
+            get
+            {
+                if (Properties is null)
+                {
+                    Properties = new SolutionResourceProperties();
+                }
+                return Properties.TriggerCriteria;
+            }
+        }
+
         /// <summary> Client input parameters to run Solution. </summary>
-        public IDictionary<string, string> Parameters { get; }
+        public IDictionary<string, string> Parameters
+        {
+            get
+            {
+                if (Properties is null)
+                {
+                    Properties = new SolutionResourceProperties();
+                }
+                return Properties.Parameters;
+            }
+        }
+
         /// <summary> Solution Id to identify single solution. </summary>
-        public string SolutionId { get; }
+        public string SolutionId
+        {
+            get
+            {
+                return Properties is null ? default : Properties.SolutionId;
+            }
+        }
+
         /// <summary> Status of solution provisioning. </summary>
-        public SolutionProvisioningState? ProvisioningState { get; }
+        public SolutionProvisioningState? ProvisioningState
+        {
+            get
+            {
+                return Properties is null ? default : Properties.ProvisioningState;
+            }
+        }
+
         /// <summary> The title. </summary>
-        public string Title { get; }
+        public string Title
+        {
+            get
+            {
+                return Properties is null ? default : Properties.Title;
+            }
+        }
+
         /// <summary> The HTML content that needs to be rendered and shown to customer. </summary>
-        public string Content { get; }
+        public string Content
+        {
+            get
+            {
+                return Properties is null ? default : Properties.Content;
+            }
+        }
+
         /// <summary> Solution replacement maps. </summary>
-        public SolutionReplacementMaps ReplacementMaps { get; }
+        public SolutionReplacementMaps ReplacementMaps
+        {
+            get
+            {
+                return Properties is null ? default : Properties.ReplacementMaps;
+            }
+        }
+
         /// <summary> List of section object. </summary>
-        public IReadOnlyList<SelfHelpSection> Sections { get; }
+        public IReadOnlyList<SelfHelpSection> Sections
+        {
+            get
+            {
+                if (Properties is null)
+                {
+                    Properties = new SolutionResourceProperties();
+                }
+                return Properties.Sections;
+            }
+        }
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpSolutionResult.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpSolutionResult.Serialization.cs
deleted file mode 100644
index 48dbbd1948e3..000000000000
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpSolutionResult.Serialization.cs
+++ /dev/null
@@ -1,232 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text;
-using System.Text.Json;
-using Azure.Core;
-using Azure.ResourceManager.Models;
-
-namespace Azure.ResourceManager.SelfHelp.Models
-{
-    public partial class SelfHelpSolutionResult : IUtf8JsonSerializable, IJsonModel<SelfHelpSolutionResult>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<SelfHelpSolutionResult>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<SelfHelpSolutionResult>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpSolutionResult>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(SelfHelpSolutionResult)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-            writer.WritePropertyName("properties"u8);
-            writer.WriteStartObject();
-            if (options.Format != "W" && Optional.IsDefined(SolutionId))
-            {
-                writer.WritePropertyName("solutionId"u8);
-                writer.WriteStringValue(SolutionId);
-            }
-            if (options.Format != "W" && Optional.IsDefined(Title))
-            {
-                writer.WritePropertyName("title"u8);
-                writer.WriteStringValue(Title);
-            }
-            if (options.Format != "W" && Optional.IsDefined(Content))
-            {
-                writer.WritePropertyName("content"u8);
-                writer.WriteStringValue(Content);
-            }
-            if (options.Format != "W" && Optional.IsDefined(ReplacementMaps))
-            {
-                writer.WritePropertyName("replacementMaps"u8);
-                writer.WriteObjectValue(ReplacementMaps, options);
-            }
-            if (options.Format != "W" && Optional.IsCollectionDefined(Sections))
-            {
-                writer.WritePropertyName("sections"u8);
-                writer.WriteStartArray();
-                foreach (var item in Sections)
-                {
-                    writer.WriteObjectValue(item, options);
-                }
-                writer.WriteEndArray();
-            }
-            writer.WriteEndObject();
-        }
-
-        SelfHelpSolutionResult IJsonModel<SelfHelpSolutionResult>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpSolutionResult>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(SelfHelpSolutionResult)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeSelfHelpSolutionResult(document.RootElement, options);
-        }
-
-        internal static SelfHelpSolutionResult DeserializeSelfHelpSolutionResult(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            ResourceIdentifier id = default;
-            string name = default;
-            ResourceType type = default;
-            SystemData systemData = default;
-            string solutionId = default;
-            string title = default;
-            string content = default;
-            ReplacementMapsResult replacementMaps = default;
-            IReadOnlyList<SolutionSection> sections = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("id"u8))
-                {
-                    id = new ResourceIdentifier(property.Value.GetString());
-                    continue;
-                }
-                if (property.NameEquals("name"u8))
-                {
-                    name = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("type"u8))
-                {
-                    type = new ResourceType(property.Value.GetString());
-                    continue;
-                }
-                if (property.NameEquals("systemData"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    systemData = ModelReaderWriter.Read<SystemData>(new BinaryData(Encoding.UTF8.GetBytes(property.Value.GetRawText())), ModelSerializationExtensions.WireOptions, AzureResourceManagerSelfHelpContext.Default);
-                    continue;
-                }
-                if (property.NameEquals("properties"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        property.ThrowNonNullablePropertyIsNull();
-                        continue;
-                    }
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        if (property0.NameEquals("solutionId"u8))
-                        {
-                            solutionId = property0.Value.GetString();
-                            continue;
-                        }
-                        if (property0.NameEquals("title"u8))
-                        {
-                            title = property0.Value.GetString();
-                            continue;
-                        }
-                        if (property0.NameEquals("content"u8))
-                        {
-                            content = property0.Value.GetString();
-                            continue;
-                        }
-                        if (property0.NameEquals("replacementMaps"u8))
-                        {
-                            if (property0.Value.ValueKind == JsonValueKind.Null)
-                            {
-                                continue;
-                            }
-                            replacementMaps = ReplacementMapsResult.DeserializeReplacementMapsResult(property0.Value, options);
-                            continue;
-                        }
-                        if (property0.NameEquals("sections"u8))
-                        {
-                            if (property0.Value.ValueKind == JsonValueKind.Null)
-                            {
-                                continue;
-                            }
-                            List<SolutionSection> array = new List<SolutionSection>();
-                            foreach (var item in property0.Value.EnumerateArray())
-                            {
-                                array.Add(SolutionSection.DeserializeSolutionSection(item, options));
-                            }
-                            sections = array;
-                            continue;
-                        }
-                    }
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new SelfHelpSolutionResult(
-                id,
-                name,
-                type,
-                systemData,
-                solutionId,
-                title,
-                content,
-                replacementMaps,
-                sections ?? new ChangeTrackingList<SolutionSection>(),
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<SelfHelpSolutionResult>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpSolutionResult>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options, AzureResourceManagerSelfHelpContext.Default);
-                default:
-                    throw new FormatException($"The model {nameof(SelfHelpSolutionResult)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        SelfHelpSolutionResult IPersistableModel<SelfHelpSolutionResult>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpSolutionResult>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
-                        return DeserializeSelfHelpSolutionResult(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(SelfHelpSolutionResult)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<SelfHelpSolutionResult>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-    }
-}
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpSolutionResult.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpSolutionResult.cs
deleted file mode 100644
index 71470a45422b..000000000000
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpSolutionResult.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-using Azure.Core;
-using Azure.ResourceManager.Models;
-
-namespace Azure.ResourceManager.SelfHelp.Models
-{
-    /// <summary> Self Help Solution response. </summary>
-    public partial class SelfHelpSolutionResult : ResourceData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="SelfHelpSolutionResult"/>. </summary>
-        public SelfHelpSolutionResult()
-        {
-            Sections = new ChangeTrackingList<SolutionSection>();
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SelfHelpSolutionResult"/>. </summary>
-        /// <param name="id"> The id. </param>
-        /// <param name="name"> The name. </param>
-        /// <param name="resourceType"> The resourceType. </param>
-        /// <param name="systemData"> The systemData. </param>
-        /// <param name="solutionId"> SolutionId is a unique id to identify a solution. You can retrieve the solution id using the Discovery api - https://learn.microsoft.com/en-us/rest/api/help/discovery-solution/list?view=rest-help-2023-09-01-preview&amp;tabs=HTTP. </param>
-        /// <param name="title"> The title. </param>
-        /// <param name="content"> The HTML content that needs to be rendered and shown to customer. </param>
-        /// <param name="replacementMaps"> Solution replacement maps. </param>
-        /// <param name="sections"> List of section object. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal SelfHelpSolutionResult(ResourceIdentifier id, string name, ResourceType resourceType, SystemData systemData, string solutionId, string title, string content, ReplacementMapsResult replacementMaps, IReadOnlyList<SolutionSection> sections, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(id, name, resourceType, systemData)
-        {
-            SolutionId = solutionId;
-            Title = title;
-            Content = content;
-            ReplacementMaps = replacementMaps;
-            Sections = sections;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> SolutionId is a unique id to identify a solution. You can retrieve the solution id using the Discovery api - https://learn.microsoft.com/en-us/rest/api/help/discovery-solution/list?view=rest-help-2023-09-01-preview&amp;tabs=HTTP. </summary>
-        public string SolutionId { get; }
-        /// <summary> The title. </summary>
-        public string Title { get; }
-        /// <summary> The HTML content that needs to be rendered and shown to customer. </summary>
-        public string Content { get; }
-        /// <summary> Solution replacement maps. </summary>
-        public ReplacementMapsResult ReplacementMaps { get; }
-        /// <summary> List of section object. </summary>
-        public IReadOnlyList<SolutionSection> Sections { get; }
-    }
-}
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpSolutionType.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpSolutionType.cs
index fb9718c646bd..ffd4a862ea97 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpSolutionType.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpSolutionType.cs
@@ -7,6 +7,7 @@
 
 using System;
 using System.ComponentModel;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
@@ -14,44 +15,67 @@ namespace Azure.ResourceManager.SelfHelp.Models
     public readonly partial struct SelfHelpSolutionType : IEquatable<SelfHelpSolutionType>
     {
         private readonly string _value;
+        /// <summary> Diagnostics resource type. </summary>
+        private const string DiagnosticsValue = "Diagnostics";
+        /// <summary> Solutions resource type. </summary>
+        private const string SolutionsValue = "Solutions";
+        /// <summary> Troubleshooters resource type. </summary>
+        private const string TroubleshootersValue = "Troubleshooters";
+        /// <summary> SelfHelp resource type. </summary>
+        private const string SelfHelpValue = "SelfHelp";
 
         /// <summary> Initializes a new instance of <see cref="SelfHelpSolutionType"/>. </summary>
+        /// <param name="value"> The value. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
         public SelfHelpSolutionType(string value)
         {
-            _value = value ?? throw new ArgumentNullException(nameof(value));
-        }
+            Argument.AssertNotNull(value, nameof(value));
 
-        private const string DiagnosticsValue = "Diagnostics";
-        private const string SolutionsValue = "Solutions";
-        private const string TroubleshootersValue = "Troubleshooters";
-        private const string SelfHelpValue = "SelfHelp";
+            _value = value;
+        }
 
         /// <summary> Diagnostics resource type. </summary>
         public static SelfHelpSolutionType Diagnostics { get; } = new SelfHelpSolutionType(DiagnosticsValue);
+
         /// <summary> Solutions resource type. </summary>
         public static SelfHelpSolutionType Solutions { get; } = new SelfHelpSolutionType(SolutionsValue);
+
         /// <summary> Troubleshooters resource type. </summary>
         public static SelfHelpSolutionType Troubleshooters { get; } = new SelfHelpSolutionType(TroubleshootersValue);
+
         /// <summary> SelfHelp resource type. </summary>
         public static SelfHelpSolutionType SelfHelp { get; } = new SelfHelpSolutionType(SelfHelpValue);
+
         /// <summary> Determines if two <see cref="SelfHelpSolutionType"/> values are the same. </summary>
+        /// <param name="left"> The left value to compare. </param>
+        /// <param name="right"> The right value to compare. </param>
         public static bool operator ==(SelfHelpSolutionType left, SelfHelpSolutionType right) => left.Equals(right);
+
         /// <summary> Determines if two <see cref="SelfHelpSolutionType"/> values are not the same. </summary>
+        /// <param name="left"> The left value to compare. </param>
+        /// <param name="right"> The right value to compare. </param>
         public static bool operator !=(SelfHelpSolutionType left, SelfHelpSolutionType right) => !left.Equals(right);
-        /// <summary> Converts a <see cref="string"/> to a <see cref="SelfHelpSolutionType"/>. </summary>
+
+        /// <summary> Converts a string to a <see cref="SelfHelpSolutionType"/>. </summary>
+        /// <param name="value"> The value. </param>
         public static implicit operator SelfHelpSolutionType(string value) => new SelfHelpSolutionType(value);
 
-        /// <inheritdoc />
+        /// <summary> Converts a string to a <see cref="SelfHelpSolutionType"/>. </summary>
+        /// <param name="value"> The value. </param>
+        public static implicit operator SelfHelpSolutionType?(string value) => value == null ? null : new SelfHelpSolutionType(value);
+
+        /// <inheritdoc/>
         [EditorBrowsable(EditorBrowsableState.Never)]
         public override bool Equals(object obj) => obj is SelfHelpSolutionType other && Equals(other);
-        /// <inheritdoc />
+
+        /// <inheritdoc/>
         public bool Equals(SelfHelpSolutionType other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
 
-        /// <inheritdoc />
+        /// <inheritdoc/>
         [EditorBrowsable(EditorBrowsableState.Never)]
         public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
-        /// <inheritdoc />
+
+        /// <inheritdoc/>
         public override string ToString() => _value;
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpSolutions.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpSolutions.Serialization.cs
new file mode 100644
index 000000000000..c80ca10e626a
--- /dev/null
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpSolutions.Serialization.cs
@@ -0,0 +1,155 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.ResourceManager.SelfHelp;
+
+namespace Azure.ResourceManager.SelfHelp.Models
+{
+    /// <summary> List of solutions. </summary>
+    internal partial class SelfHelpSolutions : IJsonModel<SelfHelpSolutions>
+    {
+        /// <param name="writer"> The JSON writer. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        void IJsonModel<SelfHelpSolutions>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            writer.WriteStartObject();
+            JsonModelWriteCore(writer, options);
+            writer.WriteEndObject();
+        }
+
+        /// <param name="writer"> The JSON writer. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpSolutions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(SelfHelpSolutions)} does not support writing '{format}' format.");
+            }
+            if (Optional.IsCollectionDefined(Solutions))
+            {
+                writer.WritePropertyName("solutions"u8);
+                writer.WriteStartArray();
+                foreach (SolutionMetadataProperties item in Solutions)
+                {
+                    writer.WriteObjectValue(item, options);
+                }
+                writer.WriteEndArray();
+            }
+            if (options.Format != "W" && _additionalBinaryDataProperties != null)
+            {
+                foreach (var item in _additionalBinaryDataProperties)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+                    writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+        }
+
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        SelfHelpSolutions IJsonModel<SelfHelpSolutions>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options);
+
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual SelfHelpSolutions JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpSolutions>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(SelfHelpSolutions)} does not support reading '{format}' format.");
+            }
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeSelfHelpSolutions(document.RootElement, options);
+        }
+
+        /// <param name="element"> The JSON element to deserialize. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        internal static SelfHelpSolutions DeserializeSelfHelpSolutions(JsonElement element, ModelReaderWriterOptions options)
+        {
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            IList<SolutionMetadataProperties> solutions = default;
+            IDictionary<string, BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            foreach (var prop in element.EnumerateObject())
+            {
+                if (prop.NameEquals("solutions"u8))
+                {
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    List<SolutionMetadataProperties> array = new List<SolutionMetadataProperties>();
+                    foreach (var item in prop.Value.EnumerateArray())
+                    {
+                        array.Add(SolutionMetadataProperties.DeserializeSolutionMetadataProperties(item, options));
+                    }
+                    solutions = array;
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText()));
+                }
+            }
+            return new SelfHelpSolutions(solutions ?? new ChangeTrackingList<SolutionMetadataProperties>(), additionalBinaryDataProperties);
+        }
+
+        /// <param name="options"> The client options for reading and writing models. </param>
+        BinaryData IPersistableModel<SelfHelpSolutions>.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
+
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpSolutions>)this).GetFormatFromOptions(options) : options.Format;
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options, AzureResourceManagerSelfHelpContext.Default);
+                default:
+                    throw new FormatException($"The model {nameof(SelfHelpSolutions)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        SelfHelpSolutions IPersistableModel<SelfHelpSolutions>.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options);
+
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual SelfHelpSolutions PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpSolutions>)this).GetFormatFromOptions(options) : options.Format;
+            switch (format)
+            {
+                case "J":
+                    using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
+                    {
+                        return DeserializeSelfHelpSolutions(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(SelfHelpSolutions)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        /// <param name="options"> The client options for reading and writing models. </param>
+        string IPersistableModel<SelfHelpSolutions>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+    }
+}
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpSolutions.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpSolutions.cs
new file mode 100644
index 000000000000..31f9c9e6ef6d
--- /dev/null
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpSolutions.cs
@@ -0,0 +1,38 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+using Azure.ResourceManager.SelfHelp;
+
+namespace Azure.ResourceManager.SelfHelp.Models
+{
+    /// <summary> List of solutions. </summary>
+    internal partial class SelfHelpSolutions
+    {
+        /// <summary> Keeps track of any properties unknown to the library. </summary>
+        private protected readonly IDictionary<string, BinaryData> _additionalBinaryDataProperties;
+
+        /// <summary> Initializes a new instance of <see cref="SelfHelpSolutions"/>. </summary>
+        public SelfHelpSolutions()
+        {
+            Solutions = new ChangeTrackingList<SolutionMetadataProperties>();
+        }
+
+        /// <summary> Initializes a new instance of <see cref="SelfHelpSolutions"/>. </summary>
+        /// <param name="solutions"> List of metadata. </param>
+        /// <param name="additionalBinaryDataProperties"> Keeps track of any properties unknown to the library. </param>
+        internal SelfHelpSolutions(IList<SolutionMetadataProperties> solutions, IDictionary<string, BinaryData> additionalBinaryDataProperties)
+        {
+            Solutions = solutions;
+            _additionalBinaryDataProperties = additionalBinaryDataProperties;
+        }
+
+        /// <summary> List of metadata. </summary>
+        public IList<SolutionMetadataProperties> Solutions { get; } = new ChangeTrackingList<SolutionMetadataProperties>();
+    }
+}
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpStep.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpStep.Serialization.cs
index 1f458ec03894..690fd4f59735 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpStep.Serialization.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpStep.Serialization.cs
@@ -10,14 +10,16 @@
 using System.Collections.Generic;
 using System.Text;
 using System.Text.Json;
-using Azure.Core;
+using Azure;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
-    public partial class SelfHelpStep : IUtf8JsonSerializable, IJsonModel<SelfHelpStep>
+    /// <summary> Troubleshooter step. </summary>
+    public partial class SelfHelpStep : IJsonModel<SelfHelpStep>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<SelfHelpStep>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
+        /// <param name="writer"> The JSON writer. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
         void IJsonModel<SelfHelpStep>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
@@ -29,12 +31,11 @@ void IJsonModel<SelfHelpStep>.Write(Utf8JsonWriter writer, ModelReaderWriterOpti
         /// <param name="options"> The client options for reading and writing models. </param>
         protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpStep>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpStep>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(SelfHelpStep)} does not support writing '{format}' format.");
             }
-
             if (Optional.IsDefined(Id))
             {
                 writer.WritePropertyName("id"u8);
@@ -79,7 +80,7 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             {
                 writer.WritePropertyName("inputs"u8);
                 writer.WriteStartArray();
-                foreach (var item in Inputs)
+                foreach (TroubleshooterStepInput item in Inputs)
                 {
                     writer.WriteObjectValue(item, options);
                 }
@@ -94,7 +95,7 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             {
                 writer.WritePropertyName("insights"u8);
                 writer.WriteStartArray();
-                foreach (var item in Insights)
+                foreach (SelfHelpDiagnosticInsight item in Insights)
                 {
                     writer.WriteObjectValue(item, options);
                 }
@@ -105,15 +106,15 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
                 writer.WritePropertyName("error"u8);
                 ((IJsonModel<ResponseError>)Error).Write(writer, options);
             }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            if (options.Format != "W" && _additionalBinaryDataProperties != null)
             {
-                foreach (var item in _serializedAdditionalRawData)
+                foreach (var item in _additionalBinaryDataProperties)
                 {
                     writer.WritePropertyName(item.Key);
 #if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
+                    writer.WriteRawValue(item.Value);
 #else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value, ModelSerializationExtensions.JsonDocumentOptions))
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
                     {
                         JsonSerializer.Serialize(writer, document.RootElement);
                     }
@@ -122,22 +123,27 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             }
         }
 
-        SelfHelpStep IJsonModel<SelfHelpStep>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        SelfHelpStep IJsonModel<SelfHelpStep>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options);
+
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual SelfHelpStep JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpStep>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpStep>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(SelfHelpStep)} does not support reading '{format}' format.");
             }
-
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
             return DeserializeSelfHelpStep(document.RootElement, options);
         }
 
-        internal static SelfHelpStep DeserializeSelfHelpStep(JsonElement element, ModelReaderWriterOptions options = null)
+        /// <param name="element"> The JSON element to deserialize. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        internal static SelfHelpStep DeserializeSelfHelpStep(JsonElement element, ModelReaderWriterOptions options)
         {
-            options ??= ModelSerializationExtensions.WireOptions;
-
             if (element.ValueKind == JsonValueKind.Null)
             {
                 return null;
@@ -148,120 +154,118 @@ internal static SelfHelpStep DeserializeSelfHelpStep(JsonElement element, ModelR
             string guidance = default;
             TroubleshooterExecutionStatus? executionStatus = default;
             string executionStatusDescription = default;
-            SelfHelpType? type = default;
+            SelfHelpType? stepType = default;
             bool? isLastStep = default;
-            IReadOnlyList<TroubleshooterStepInput> inputs = default;
+            IList<TroubleshooterStepInput> inputs = default;
             AutomatedCheckResult automatedCheckResults = default;
-            IReadOnlyList<SelfHelpDiagnosticInsight> insights = default;
+            IList<SelfHelpDiagnosticInsight> insights = default;
             ResponseError error = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
+            IDictionary<string, BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            foreach (var prop in element.EnumerateObject())
             {
-                if (property.NameEquals("id"u8))
+                if (prop.NameEquals("id"u8))
                 {
-                    id = property.Value.GetString();
+                    id = prop.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("title"u8))
+                if (prop.NameEquals("title"u8))
                 {
-                    title = property.Value.GetString();
+                    title = prop.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("description"u8))
+                if (prop.NameEquals("description"u8))
                 {
-                    description = property.Value.GetString();
+                    description = prop.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("guidance"u8))
+                if (prop.NameEquals("guidance"u8))
                 {
-                    guidance = property.Value.GetString();
+                    guidance = prop.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("executionStatus"u8))
+                if (prop.NameEquals("executionStatus"u8))
                 {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
-                    executionStatus = new TroubleshooterExecutionStatus(property.Value.GetString());
+                    executionStatus = new TroubleshooterExecutionStatus(prop.Value.GetString());
                     continue;
                 }
-                if (property.NameEquals("executionStatusDescription"u8))
+                if (prop.NameEquals("executionStatusDescription"u8))
                 {
-                    executionStatusDescription = property.Value.GetString();
+                    executionStatusDescription = prop.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("type"u8))
+                if (prop.NameEquals("type"u8))
                 {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
-                    type = new SelfHelpType(property.Value.GetString());
+                    stepType = new SelfHelpType(prop.Value.GetString());
                     continue;
                 }
-                if (property.NameEquals("isLastStep"u8))
+                if (prop.NameEquals("isLastStep"u8))
                 {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
-                    isLastStep = property.Value.GetBoolean();
+                    isLastStep = prop.Value.GetBoolean();
                     continue;
                 }
-                if (property.NameEquals("inputs"u8))
+                if (prop.NameEquals("inputs"u8))
                 {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
                     List<TroubleshooterStepInput> array = new List<TroubleshooterStepInput>();
-                    foreach (var item in property.Value.EnumerateArray())
+                    foreach (var item in prop.Value.EnumerateArray())
                     {
                         array.Add(TroubleshooterStepInput.DeserializeTroubleshooterStepInput(item, options));
                     }
                     inputs = array;
                     continue;
                 }
-                if (property.NameEquals("automatedCheckResults"u8))
+                if (prop.NameEquals("automatedCheckResults"u8))
                 {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
-                    automatedCheckResults = AutomatedCheckResult.DeserializeAutomatedCheckResult(property.Value, options);
+                    automatedCheckResults = AutomatedCheckResult.DeserializeAutomatedCheckResult(prop.Value, options);
                     continue;
                 }
-                if (property.NameEquals("insights"u8))
+                if (prop.NameEquals("insights"u8))
                 {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
                     List<SelfHelpDiagnosticInsight> array = new List<SelfHelpDiagnosticInsight>();
-                    foreach (var item in property.Value.EnumerateArray())
+                    foreach (var item in prop.Value.EnumerateArray())
                     {
                         array.Add(SelfHelpDiagnosticInsight.DeserializeSelfHelpDiagnosticInsight(item, options));
                     }
                     insights = array;
                     continue;
                 }
-                if (property.NameEquals("error"u8))
+                if (prop.NameEquals("error"u8))
                 {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
-                    error = ModelReaderWriter.Read<ResponseError>(new BinaryData(Encoding.UTF8.GetBytes(property.Value.GetRawText())), options, AzureResourceManagerSelfHelpContext.Default);
+                    error = ModelReaderWriter.Read<ResponseError>(new BinaryData(Encoding.UTF8.GetBytes(prop.Value.GetRawText())), ModelSerializationExtensions.WireOptions, AzureResourceManagerSelfHelpContext.Default);
                     continue;
                 }
                 if (options.Format != "W")
                 {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                    additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText()));
                 }
             }
-            serializedAdditionalRawData = rawDataDictionary;
             return new SelfHelpStep(
                 id,
                 title,
@@ -269,19 +273,22 @@ internal static SelfHelpStep DeserializeSelfHelpStep(JsonElement element, ModelR
                 guidance,
                 executionStatus,
                 executionStatusDescription,
-                type,
+                stepType,
                 isLastStep,
                 inputs ?? new ChangeTrackingList<TroubleshooterStepInput>(),
                 automatedCheckResults,
                 insights ?? new ChangeTrackingList<SelfHelpDiagnosticInsight>(),
                 error,
-                serializedAdditionalRawData);
+                additionalBinaryDataProperties);
         }
 
-        BinaryData IPersistableModel<SelfHelpStep>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpStep>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="options"> The client options for reading and writing models. </param>
+        BinaryData IPersistableModel<SelfHelpStep>.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
 
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpStep>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
@@ -291,15 +298,20 @@ BinaryData IPersistableModel<SelfHelpStep>.Write(ModelReaderWriterOptions option
             }
         }
 
-        SelfHelpStep IPersistableModel<SelfHelpStep>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpStep>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        SelfHelpStep IPersistableModel<SelfHelpStep>.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options);
 
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual SelfHelpStep PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpStep>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
+                    using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
                     {
-                        using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
                         return DeserializeSelfHelpStep(document.RootElement, options);
                     }
                 default:
@@ -307,6 +319,7 @@ SelfHelpStep IPersistableModel<SelfHelpStep>.Create(BinaryData data, ModelReader
             }
         }
 
+        /// <param name="options"> The client options for reading and writing models. </param>
         string IPersistableModel<SelfHelpStep>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpStep.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpStep.cs
index 3ca05c758a41..87db554de57f 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpStep.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpStep.cs
@@ -7,43 +7,16 @@
 
 using System;
 using System.Collections.Generic;
+using Azure;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
     /// <summary> Troubleshooter step. </summary>
     public partial class SelfHelpStep
     {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+        /// <summary> Keeps track of any properties unknown to the library. </summary>
+        private protected readonly IDictionary<string, BinaryData> _additionalBinaryDataProperties;
 
         /// <summary> Initializes a new instance of <see cref="SelfHelpStep"/>. </summary>
         internal SelfHelpStep()
@@ -65,8 +38,8 @@ internal SelfHelpStep()
         /// <param name="automatedCheckResults"> Only for AutomatedStep type. </param>
         /// <param name="insights"></param>
         /// <param name="error"> The error detail. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal SelfHelpStep(string id, string title, string description, string guidance, TroubleshooterExecutionStatus? executionStatus, string executionStatusDescription, SelfHelpType? stepType, bool? isLastStep, IReadOnlyList<TroubleshooterStepInput> inputs, AutomatedCheckResult automatedCheckResults, IReadOnlyList<SelfHelpDiagnosticInsight> insights, ResponseError error, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        /// <param name="additionalBinaryDataProperties"> Keeps track of any properties unknown to the library. </param>
+        internal SelfHelpStep(string id, string title, string description, string guidance, TroubleshooterExecutionStatus? executionStatus, string executionStatusDescription, SelfHelpType? stepType, bool? isLastStep, IList<TroubleshooterStepInput> inputs, AutomatedCheckResult automatedCheckResults, IList<SelfHelpDiagnosticInsight> insights, ResponseError error, IDictionary<string, BinaryData> additionalBinaryDataProperties)
         {
             Id = id;
             Title = title;
@@ -80,31 +53,42 @@ internal SelfHelpStep(string id, string title, string description, string guidan
             AutomatedCheckResults = automatedCheckResults;
             Insights = insights;
             Error = error;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
+            _additionalBinaryDataProperties = additionalBinaryDataProperties;
         }
 
         /// <summary> Unique step id. </summary>
         public string Id { get; }
+
         /// <summary> Step title. </summary>
         public string Title { get; }
+
         /// <summary> Step description. </summary>
         public string Description { get; }
+
         /// <summary> Get or sets the Step guidance. </summary>
         public string Guidance { get; }
+
         /// <summary> Status of Troubleshooter Step execution. </summary>
         public TroubleshooterExecutionStatus? ExecutionStatus { get; }
+
         /// <summary> This field has more detailed status description of the execution status. </summary>
         public string ExecutionStatusDescription { get; }
+
         /// <summary> Type of Troubleshooting step. </summary>
         public SelfHelpType? StepType { get; }
+
         /// <summary> is this last step of the workflow. </summary>
         public bool? IsLastStep { get; }
-        /// <summary> Gets the inputs. </summary>
-        public IReadOnlyList<TroubleshooterStepInput> Inputs { get; }
+
+        /// <summary> Gets the Inputs. </summary>
+        public IList<TroubleshooterStepInput> Inputs { get; }
+
         /// <summary> Only for AutomatedStep type. </summary>
         public AutomatedCheckResult AutomatedCheckResults { get; }
-        /// <summary> Gets the insights. </summary>
-        public IReadOnlyList<SelfHelpDiagnosticInsight> Insights { get; }
+
+        /// <summary> Gets the Insights. </summary>
+        public IList<SelfHelpDiagnosticInsight> Insights { get; }
+
         /// <summary> The error detail. </summary>
         public ResponseError Error { get; }
     }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpType.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpType.cs
index 9a5dc7c3d31c..e5ec22f57d7c 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpType.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpType.cs
@@ -7,6 +7,7 @@
 
 using System;
 using System.ComponentModel;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
@@ -14,47 +15,67 @@ namespace Azure.ResourceManager.SelfHelp.Models
     public readonly partial struct SelfHelpType : IEquatable<SelfHelpType>
     {
         private readonly string _value;
+        private const string DecisionValue = "Decision";
+        private const string SolutionValue = "Solution";
+        private const string InsightValue = "Insight";
+        private const string AutomatedCheckValue = "AutomatedCheck";
+        private const string InputValue = "Input";
 
         /// <summary> Initializes a new instance of <see cref="SelfHelpType"/>. </summary>
+        /// <param name="value"> The value. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
         public SelfHelpType(string value)
         {
-            _value = value ?? throw new ArgumentNullException(nameof(value));
-        }
+            Argument.AssertNotNull(value, nameof(value));
 
-        private const string DecisionValue = "Decision";
-        private const string SolutionValue = "Solution";
-        private const string InsightValue = "Insight";
-        private const string AutomatedCheckValue = "AutomatedCheck";
-        private const string InputValue = "Input";
+            _value = value;
+        }
 
-        /// <summary> Decision. </summary>
+        /// <summary> Gets the Decision. </summary>
         public static SelfHelpType Decision { get; } = new SelfHelpType(DecisionValue);
-        /// <summary> Solution. </summary>
+
+        /// <summary> Gets the Solution. </summary>
         public static SelfHelpType Solution { get; } = new SelfHelpType(SolutionValue);
-        /// <summary> Insight. </summary>
+
+        /// <summary> Gets the Insight. </summary>
         public static SelfHelpType Insight { get; } = new SelfHelpType(InsightValue);
-        /// <summary> AutomatedCheck. </summary>
+
+        /// <summary> Gets the AutomatedCheck. </summary>
         public static SelfHelpType AutomatedCheck { get; } = new SelfHelpType(AutomatedCheckValue);
-        /// <summary> Input. </summary>
+
+        /// <summary> Gets the Input. </summary>
         public static SelfHelpType Input { get; } = new SelfHelpType(InputValue);
+
         /// <summary> Determines if two <see cref="SelfHelpType"/> values are the same. </summary>
+        /// <param name="left"> The left value to compare. </param>
+        /// <param name="right"> The right value to compare. </param>
         public static bool operator ==(SelfHelpType left, SelfHelpType right) => left.Equals(right);
+
         /// <summary> Determines if two <see cref="SelfHelpType"/> values are not the same. </summary>
+        /// <param name="left"> The left value to compare. </param>
+        /// <param name="right"> The right value to compare. </param>
         public static bool operator !=(SelfHelpType left, SelfHelpType right) => !left.Equals(right);
-        /// <summary> Converts a <see cref="string"/> to a <see cref="SelfHelpType"/>. </summary>
+
+        /// <summary> Converts a string to a <see cref="SelfHelpType"/>. </summary>
+        /// <param name="value"> The value. </param>
         public static implicit operator SelfHelpType(string value) => new SelfHelpType(value);
 
-        /// <inheritdoc />
+        /// <summary> Converts a string to a <see cref="SelfHelpType"/>. </summary>
+        /// <param name="value"> The value. </param>
+        public static implicit operator SelfHelpType?(string value) => value == null ? null : new SelfHelpType(value);
+
+        /// <inheritdoc/>
         [EditorBrowsable(EditorBrowsableState.Never)]
         public override bool Equals(object obj) => obj is SelfHelpType other && Equals(other);
-        /// <inheritdoc />
+
+        /// <inheritdoc/>
         public bool Equals(SelfHelpType other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
 
-        /// <inheritdoc />
+        /// <inheritdoc/>
         [EditorBrowsable(EditorBrowsableState.Never)]
         public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
-        /// <inheritdoc />
+
+        /// <inheritdoc/>
         public override string ToString() => _value;
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpVideo.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpVideo.Serialization.cs
index 4314df855991..c6a79f6c6a01 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpVideo.Serialization.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpVideo.Serialization.cs
@@ -9,14 +9,15 @@
 using System.ClientModel.Primitives;
 using System.Collections.Generic;
 using System.Text.Json;
-using Azure.Core;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
-    public partial class SelfHelpVideo : IUtf8JsonSerializable, IJsonModel<SelfHelpVideo>
+    /// <summary> Video detail. </summary>
+    public partial class SelfHelpVideo : VideoGroupVideo, IJsonModel<SelfHelpVideo>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<SelfHelpVideo>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
+        /// <param name="writer"> The JSON writer. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
         void IJsonModel<SelfHelpVideo>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
@@ -28,12 +29,11 @@ void IJsonModel<SelfHelpVideo>.Write(Utf8JsonWriter writer, ModelReaderWriterOpt
         /// <param name="options"> The client options for reading and writing models. </param>
         protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpVideo>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpVideo>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(SelfHelpVideo)} does not support writing '{format}' format.");
             }
-
             base.JsonModelWriteCore(writer, options);
             if (Optional.IsDefined(ReplacementKey))
             {
@@ -42,61 +42,67 @@ protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWri
             }
         }
 
-        SelfHelpVideo IJsonModel<SelfHelpVideo>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        SelfHelpVideo IJsonModel<SelfHelpVideo>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => (SelfHelpVideo)JsonModelCreateCore(ref reader, options);
+
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected override VideoGroupVideo JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpVideo>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpVideo>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(SelfHelpVideo)} does not support reading '{format}' format.");
             }
-
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
             return DeserializeSelfHelpVideo(document.RootElement, options);
         }
 
-        internal static SelfHelpVideo DeserializeSelfHelpVideo(JsonElement element, ModelReaderWriterOptions options = null)
+        /// <param name="element"> The JSON element to deserialize. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        internal static SelfHelpVideo DeserializeSelfHelpVideo(JsonElement element, ModelReaderWriterOptions options)
         {
-            options ??= ModelSerializationExtensions.WireOptions;
-
             if (element.ValueKind == JsonValueKind.Null)
             {
                 return null;
             }
-            string replacementKey = default;
             string src = default;
             string title = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
+            IDictionary<string, BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            string replacementKey = default;
+            foreach (var prop in element.EnumerateObject())
             {
-                if (property.NameEquals("replacementKey"u8))
+                if (prop.NameEquals("src"u8))
                 {
-                    replacementKey = property.Value.GetString();
+                    src = prop.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("src"u8))
+                if (prop.NameEquals("title"u8))
                 {
-                    src = property.Value.GetString();
+                    title = prop.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("title"u8))
+                if (prop.NameEquals("replacementKey"u8))
                 {
-                    title = property.Value.GetString();
+                    replacementKey = prop.Value.GetString();
                     continue;
                 }
                 if (options.Format != "W")
                 {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                    additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText()));
                 }
             }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new SelfHelpVideo(src, title, serializedAdditionalRawData, replacementKey);
+            return new SelfHelpVideo(src, title, additionalBinaryDataProperties, replacementKey);
         }
 
-        BinaryData IPersistableModel<SelfHelpVideo>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpVideo>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="options"> The client options for reading and writing models. </param>
+        BinaryData IPersistableModel<SelfHelpVideo>.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
 
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected override BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpVideo>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
@@ -106,15 +112,20 @@ BinaryData IPersistableModel<SelfHelpVideo>.Write(ModelReaderWriterOptions optio
             }
         }
 
-        SelfHelpVideo IPersistableModel<SelfHelpVideo>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpVideo>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        SelfHelpVideo IPersistableModel<SelfHelpVideo>.Create(BinaryData data, ModelReaderWriterOptions options) => (SelfHelpVideo)PersistableModelCreateCore(data, options);
 
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected override VideoGroupVideo PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpVideo>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
+                    using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
                     {
-                        using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
                         return DeserializeSelfHelpVideo(document.RootElement, options);
                     }
                 default:
@@ -122,6 +133,7 @@ SelfHelpVideo IPersistableModel<SelfHelpVideo>.Create(BinaryData data, ModelRead
             }
         }
 
+        /// <param name="options"> The client options for reading and writing models. </param>
         string IPersistableModel<SelfHelpVideo>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpVideo.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpVideo.cs
index f64d241dfec0..761bbf1b3abd 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpVideo.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SelfHelpVideo.cs
@@ -21,9 +21,9 @@ internal SelfHelpVideo()
         /// <summary> Initializes a new instance of <see cref="SelfHelpVideo"/>. </summary>
         /// <param name="src"> Link to the video. </param>
         /// <param name="title"> Title of the video. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
+        /// <param name="additionalBinaryDataProperties"> Keeps track of any properties unknown to the library. </param>
         /// <param name="replacementKey"> Place holder used in HTML Content replace control with the insight content. </param>
-        internal SelfHelpVideo(string src, string title, IDictionary<string, BinaryData> serializedAdditionalRawData, string replacementKey) : base(src, title, serializedAdditionalRawData)
+        internal SelfHelpVideo(string src, string title, IDictionary<string, BinaryData> additionalBinaryDataProperties, string replacementKey) : base(src, title, additionalBinaryDataProperties)
         {
             ReplacementKey = replacementKey;
         }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SimplifiedSolutionsResourceProperties.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SimplifiedSolutionsResourceProperties.Serialization.cs
new file mode 100644
index 000000000000..908107990676
--- /dev/null
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SimplifiedSolutionsResourceProperties.Serialization.cs
@@ -0,0 +1,261 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.ResourceManager.SelfHelp;
+
+namespace Azure.ResourceManager.SelfHelp.Models
+{
+    /// <summary> Simplified Solutions result. </summary>
+    internal partial class SimplifiedSolutionsResourceProperties : IJsonModel<SimplifiedSolutionsResourceProperties>
+    {
+        /// <param name="writer"> The JSON writer. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        void IJsonModel<SimplifiedSolutionsResourceProperties>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            writer.WriteStartObject();
+            JsonModelWriteCore(writer, options);
+            writer.WriteEndObject();
+        }
+
+        /// <param name="writer"> The JSON writer. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SimplifiedSolutionsResourceProperties>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(SimplifiedSolutionsResourceProperties)} does not support writing '{format}' format.");
+            }
+            if (Optional.IsDefined(SolutionId))
+            {
+                writer.WritePropertyName("solutionId"u8);
+                writer.WriteStringValue(SolutionId);
+            }
+            if (Optional.IsCollectionDefined(Parameters))
+            {
+                writer.WritePropertyName("parameters"u8);
+                writer.WriteStartObject();
+                foreach (var item in Parameters)
+                {
+                    writer.WritePropertyName(item.Key);
+                    if (item.Value == null)
+                    {
+                        writer.WriteNullValue();
+                        continue;
+                    }
+                    writer.WriteStringValue(item.Value);
+                }
+                writer.WriteEndObject();
+            }
+            if (options.Format != "W" && Optional.IsDefined(Title))
+            {
+                writer.WritePropertyName("title"u8);
+                writer.WriteStringValue(Title);
+            }
+            if (options.Format != "W" && Optional.IsCollectionDefined(Appendix))
+            {
+                writer.WritePropertyName("appendix"u8);
+                writer.WriteStartObject();
+                foreach (var item in Appendix)
+                {
+                    writer.WritePropertyName(item.Key);
+                    if (item.Value == null)
+                    {
+                        writer.WriteNullValue();
+                        continue;
+                    }
+                    writer.WriteStringValue(item.Value);
+                }
+                writer.WriteEndObject();
+            }
+            if (options.Format != "W" && Optional.IsDefined(Content))
+            {
+                writer.WritePropertyName("content"u8);
+                writer.WriteStringValue(Content);
+            }
+            if (options.Format != "W" && Optional.IsDefined(ProvisioningState))
+            {
+                writer.WritePropertyName("provisioningState"u8);
+                writer.WriteStringValue(ProvisioningState.Value.ToString());
+            }
+            if (options.Format != "W" && _additionalBinaryDataProperties != null)
+            {
+                foreach (var item in _additionalBinaryDataProperties)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+                    writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+        }
+
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        SimplifiedSolutionsResourceProperties IJsonModel<SimplifiedSolutionsResourceProperties>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options);
+
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual SimplifiedSolutionsResourceProperties JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SimplifiedSolutionsResourceProperties>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(SimplifiedSolutionsResourceProperties)} does not support reading '{format}' format.");
+            }
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeSimplifiedSolutionsResourceProperties(document.RootElement, options);
+        }
+
+        /// <param name="element"> The JSON element to deserialize. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        internal static SimplifiedSolutionsResourceProperties DeserializeSimplifiedSolutionsResourceProperties(JsonElement element, ModelReaderWriterOptions options)
+        {
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string solutionId = default;
+            IDictionary<string, string> parameters = default;
+            string title = default;
+            IReadOnlyDictionary<string, string> appendix = default;
+            string content = default;
+            SolutionProvisioningState? provisioningState = default;
+            IDictionary<string, BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            foreach (var prop in element.EnumerateObject())
+            {
+                if (prop.NameEquals("solutionId"u8))
+                {
+                    solutionId = prop.Value.GetString();
+                    continue;
+                }
+                if (prop.NameEquals("parameters"u8))
+                {
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
+                    foreach (var prop0 in prop.Value.EnumerateObject())
+                    {
+                        if (prop0.Value.ValueKind == JsonValueKind.Null)
+                        {
+                            dictionary.Add(prop0.Name, null);
+                        }
+                        else
+                        {
+                            dictionary.Add(prop0.Name, prop0.Value.GetString());
+                        }
+                    }
+                    parameters = dictionary;
+                    continue;
+                }
+                if (prop.NameEquals("title"u8))
+                {
+                    title = prop.Value.GetString();
+                    continue;
+                }
+                if (prop.NameEquals("appendix"u8))
+                {
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
+                    foreach (var prop0 in prop.Value.EnumerateObject())
+                    {
+                        if (prop0.Value.ValueKind == JsonValueKind.Null)
+                        {
+                            dictionary.Add(prop0.Name, null);
+                        }
+                        else
+                        {
+                            dictionary.Add(prop0.Name, prop0.Value.GetString());
+                        }
+                    }
+                    appendix = dictionary;
+                    continue;
+                }
+                if (prop.NameEquals("content"u8))
+                {
+                    content = prop.Value.GetString();
+                    continue;
+                }
+                if (prop.NameEquals("provisioningState"u8))
+                {
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    provisioningState = new SolutionProvisioningState(prop.Value.GetString());
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText()));
+                }
+            }
+            return new SimplifiedSolutionsResourceProperties(
+                solutionId,
+                parameters ?? new ChangeTrackingDictionary<string, string>(),
+                title,
+                appendix ?? new ChangeTrackingDictionary<string, string>(),
+                content,
+                provisioningState,
+                additionalBinaryDataProperties);
+        }
+
+        /// <param name="options"> The client options for reading and writing models. </param>
+        BinaryData IPersistableModel<SimplifiedSolutionsResourceProperties>.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
+
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SimplifiedSolutionsResourceProperties>)this).GetFormatFromOptions(options) : options.Format;
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options, AzureResourceManagerSelfHelpContext.Default);
+                default:
+                    throw new FormatException($"The model {nameof(SimplifiedSolutionsResourceProperties)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        SimplifiedSolutionsResourceProperties IPersistableModel<SimplifiedSolutionsResourceProperties>.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options);
+
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual SimplifiedSolutionsResourceProperties PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SimplifiedSolutionsResourceProperties>)this).GetFormatFromOptions(options) : options.Format;
+            switch (format)
+            {
+                case "J":
+                    using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
+                    {
+                        return DeserializeSimplifiedSolutionsResourceProperties(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(SimplifiedSolutionsResourceProperties)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        /// <param name="options"> The client options for reading and writing models. </param>
+        string IPersistableModel<SimplifiedSolutionsResourceProperties>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+    }
+}
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SimplifiedSolutionsResourceProperties.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SimplifiedSolutionsResourceProperties.cs
new file mode 100644
index 000000000000..c188a1e7b9b1
--- /dev/null
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SimplifiedSolutionsResourceProperties.cs
@@ -0,0 +1,64 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+using Azure.ResourceManager.SelfHelp;
+
+namespace Azure.ResourceManager.SelfHelp.Models
+{
+    /// <summary> Simplified Solutions result. </summary>
+    internal partial class SimplifiedSolutionsResourceProperties
+    {
+        /// <summary> Keeps track of any properties unknown to the library. </summary>
+        private protected readonly IDictionary<string, BinaryData> _additionalBinaryDataProperties;
+
+        /// <summary> Initializes a new instance of <see cref="SimplifiedSolutionsResourceProperties"/>. </summary>
+        public SimplifiedSolutionsResourceProperties()
+        {
+            Parameters = new ChangeTrackingDictionary<string, string>();
+            Appendix = new ChangeTrackingDictionary<string, string>();
+        }
+
+        /// <summary> Initializes a new instance of <see cref="SimplifiedSolutionsResourceProperties"/>. </summary>
+        /// <param name="solutionId"> Solution Id to identify single Simplified Solution. </param>
+        /// <param name="parameters"> Client input parameters to run Simplified Solutions. </param>
+        /// <param name="title"> The title. </param>
+        /// <param name="appendix"> Additional parameter response for Simplified Solutions. </param>
+        /// <param name="content"> The HTML content that needs to be rendered and shown to customer. </param>
+        /// <param name="provisioningState"> Status of Simplified Solution provisioning. </param>
+        /// <param name="additionalBinaryDataProperties"> Keeps track of any properties unknown to the library. </param>
+        internal SimplifiedSolutionsResourceProperties(string solutionId, IDictionary<string, string> parameters, string title, IReadOnlyDictionary<string, string> appendix, string content, SolutionProvisioningState? provisioningState, IDictionary<string, BinaryData> additionalBinaryDataProperties)
+        {
+            SolutionId = solutionId;
+            Parameters = parameters;
+            Title = title;
+            Appendix = appendix;
+            Content = content;
+            ProvisioningState = provisioningState;
+            _additionalBinaryDataProperties = additionalBinaryDataProperties;
+        }
+
+        /// <summary> Solution Id to identify single Simplified Solution. </summary>
+        public string SolutionId { get; set; }
+
+        /// <summary> Client input parameters to run Simplified Solutions. </summary>
+        public IDictionary<string, string> Parameters { get; } = new ChangeTrackingDictionary<string, string>();
+
+        /// <summary> The title. </summary>
+        public string Title { get; }
+
+        /// <summary> Additional parameter response for Simplified Solutions. </summary>
+        public IReadOnlyDictionary<string, string> Appendix { get; } = new ChangeTrackingDictionary<string, string>();
+
+        /// <summary> The HTML content that needs to be rendered and shown to customer. </summary>
+        public string Content { get; }
+
+        /// <summary> Status of Simplified Solution provisioning. </summary>
+        public SolutionProvisioningState? ProvisioningState { get; }
+    }
+}
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionMetadataProperties.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionMetadataProperties.Serialization.cs
index 17f97c755a50..5e803e14e80d 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionMetadataProperties.Serialization.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionMetadataProperties.Serialization.cs
@@ -9,14 +9,15 @@
 using System.ClientModel.Primitives;
 using System.Collections.Generic;
 using System.Text.Json;
-using Azure.Core;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
-    public partial class SolutionMetadataProperties : IUtf8JsonSerializable, IJsonModel<SolutionMetadataProperties>
+    /// <summary> Metadata Properties. </summary>
+    public partial class SolutionMetadataProperties : IJsonModel<SolutionMetadataProperties>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<SolutionMetadataProperties>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
+        /// <param name="writer"> The JSON writer. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
         void IJsonModel<SolutionMetadataProperties>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
@@ -28,12 +29,11 @@ void IJsonModel<SolutionMetadataProperties>.Write(Utf8JsonWriter writer, ModelRe
         /// <param name="options"> The client options for reading and writing models. </param>
         protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<SolutionMetadataProperties>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<SolutionMetadataProperties>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(SolutionMetadataProperties)} does not support writing '{format}' format.");
             }
-
             if (Optional.IsDefined(SolutionId))
             {
                 writer.WritePropertyName("solutionId"u8);
@@ -53,21 +53,26 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             {
                 writer.WritePropertyName("requiredInputs"u8);
                 writer.WriteStartArray();
-                foreach (var item in RequiredInputs)
+                foreach (string item in RequiredInputs)
                 {
+                    if (item == null)
+                    {
+                        writer.WriteNullValue();
+                        continue;
+                    }
                     writer.WriteStringValue(item);
                 }
                 writer.WriteEndArray();
             }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            if (options.Format != "W" && _additionalBinaryDataProperties != null)
             {
-                foreach (var item in _serializedAdditionalRawData)
+                foreach (var item in _additionalBinaryDataProperties)
                 {
                     writer.WritePropertyName(item.Key);
 #if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
+                    writer.WriteRawValue(item.Value);
 #else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value, ModelSerializationExtensions.JsonDocumentOptions))
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
                     {
                         JsonSerializer.Serialize(writer, document.RootElement);
                     }
@@ -76,22 +81,27 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             }
         }
 
-        SolutionMetadataProperties IJsonModel<SolutionMetadataProperties>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        SolutionMetadataProperties IJsonModel<SolutionMetadataProperties>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options);
+
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual SolutionMetadataProperties JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<SolutionMetadataProperties>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<SolutionMetadataProperties>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(SolutionMetadataProperties)} does not support reading '{format}' format.");
             }
-
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
             return DeserializeSolutionMetadataProperties(document.RootElement, options);
         }
 
-        internal static SolutionMetadataProperties DeserializeSolutionMetadataProperties(JsonElement element, ModelReaderWriterOptions options = null)
+        /// <param name="element"> The JSON element to deserialize. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        internal static SolutionMetadataProperties DeserializeSolutionMetadataProperties(JsonElement element, ModelReaderWriterOptions options)
         {
-            options ??= ModelSerializationExtensions.WireOptions;
-
             if (element.ValueKind == JsonValueKind.Null)
             {
                 return null;
@@ -100,56 +110,64 @@ internal static SolutionMetadataProperties DeserializeSolutionMetadataProperties
             SelfHelpSolutionType? solutionType = default;
             string description = default;
             IReadOnlyList<string> requiredInputs = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
+            IDictionary<string, BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            foreach (var prop in element.EnumerateObject())
             {
-                if (property.NameEquals("solutionId"u8))
+                if (prop.NameEquals("solutionId"u8))
                 {
-                    solutionId = property.Value.GetString();
+                    solutionId = prop.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("solutionType"u8))
+                if (prop.NameEquals("solutionType"u8))
                 {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
-                    solutionType = new SelfHelpSolutionType(property.Value.GetString());
+                    solutionType = new SelfHelpSolutionType(prop.Value.GetString());
                     continue;
                 }
-                if (property.NameEquals("description"u8))
+                if (prop.NameEquals("description"u8))
                 {
-                    description = property.Value.GetString();
+                    description = prop.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("requiredInputs"u8))
+                if (prop.NameEquals("requiredInputs"u8))
                 {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
                     List<string> array = new List<string>();
-                    foreach (var item in property.Value.EnumerateArray())
+                    foreach (var item in prop.Value.EnumerateArray())
                     {
-                        array.Add(item.GetString());
+                        if (item.ValueKind == JsonValueKind.Null)
+                        {
+                            array.Add(null);
+                        }
+                        else
+                        {
+                            array.Add(item.GetString());
+                        }
                     }
                     requiredInputs = array;
                     continue;
                 }
                 if (options.Format != "W")
                 {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                    additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText()));
                 }
             }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new SolutionMetadataProperties(solutionId, solutionType, description, requiredInputs ?? new ChangeTrackingList<string>(), serializedAdditionalRawData);
+            return new SolutionMetadataProperties(solutionId, solutionType, description, requiredInputs ?? new ChangeTrackingList<string>(), additionalBinaryDataProperties);
         }
 
-        BinaryData IPersistableModel<SolutionMetadataProperties>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SolutionMetadataProperties>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="options"> The client options for reading and writing models. </param>
+        BinaryData IPersistableModel<SolutionMetadataProperties>.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
 
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SolutionMetadataProperties>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
@@ -159,15 +177,20 @@ BinaryData IPersistableModel<SolutionMetadataProperties>.Write(ModelReaderWriter
             }
         }
 
-        SolutionMetadataProperties IPersistableModel<SolutionMetadataProperties>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SolutionMetadataProperties>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        SolutionMetadataProperties IPersistableModel<SolutionMetadataProperties>.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options);
 
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual SolutionMetadataProperties PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SolutionMetadataProperties>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
+                    using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
                     {
-                        using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
                         return DeserializeSolutionMetadataProperties(document.RootElement, options);
                     }
                 default:
@@ -175,6 +198,7 @@ SolutionMetadataProperties IPersistableModel<SolutionMetadataProperties>.Create(
             }
         }
 
+        /// <param name="options"> The client options for reading and writing models. </param>
         string IPersistableModel<SolutionMetadataProperties>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionMetadataProperties.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionMetadataProperties.cs
index 304a52284c6d..2b8edd216206 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionMetadataProperties.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionMetadataProperties.cs
@@ -7,43 +7,15 @@
 
 using System;
 using System.Collections.Generic;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
     /// <summary> Metadata Properties. </summary>
     public partial class SolutionMetadataProperties
     {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+        /// <summary> Keeps track of any properties unknown to the library. </summary>
+        private protected readonly IDictionary<string, BinaryData> _additionalBinaryDataProperties;
 
         /// <summary> Initializes a new instance of <see cref="SolutionMetadataProperties"/>. </summary>
         public SolutionMetadataProperties()
@@ -56,22 +28,25 @@ public SolutionMetadataProperties()
         /// <param name="solutionType"> Solution Type. </param>
         /// <param name="description"> A detailed description of solution. </param>
         /// <param name="requiredInputs"> Required parameters for invoking this particular solution. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal SolutionMetadataProperties(string solutionId, SelfHelpSolutionType? solutionType, string description, IReadOnlyList<string> requiredInputs, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        /// <param name="additionalBinaryDataProperties"> Keeps track of any properties unknown to the library. </param>
+        internal SolutionMetadataProperties(string solutionId, SelfHelpSolutionType? solutionType, string description, IReadOnlyList<string> requiredInputs, IDictionary<string, BinaryData> additionalBinaryDataProperties)
         {
             SolutionId = solutionId;
             SolutionType = solutionType;
             Description = description;
             RequiredInputs = requiredInputs;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
+            _additionalBinaryDataProperties = additionalBinaryDataProperties;
         }
 
         /// <summary> Solution Id. </summary>
         public string SolutionId { get; set; }
+
         /// <summary> Solution Type. </summary>
         public SelfHelpSolutionType? SolutionType { get; }
+
         /// <summary> A detailed description of solution. </summary>
         public string Description { get; }
+
         /// <summary> Required parameters for invoking this particular solution. </summary>
         public IReadOnlyList<string> RequiredInputs { get; }
     }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionNlpMetadata.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionNlpMetadata.Serialization.cs
index e0368be747ac..6837724b5df5 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionNlpMetadata.Serialization.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionNlpMetadata.Serialization.cs
@@ -12,13 +12,15 @@
 using System.Text.Json;
 using Azure.Core;
 using Azure.ResourceManager.Models;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
-    public partial class SolutionNlpMetadata : IUtf8JsonSerializable, IJsonModel<SolutionNlpMetadata>
+    /// <summary> Nlp Metadata resource. </summary>
+    public partial class SolutionNlpMetadata : ResourceData, IJsonModel<SolutionNlpMetadata>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<SolutionNlpMetadata>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
+        /// <param name="writer"> The JSON writer. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
         void IJsonModel<SolutionNlpMetadata>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
@@ -30,200 +32,114 @@ void IJsonModel<SolutionNlpMetadata>.Write(Utf8JsonWriter writer, ModelReaderWri
         /// <param name="options"> The client options for reading and writing models. </param>
         protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<SolutionNlpMetadata>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<SolutionNlpMetadata>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(SolutionNlpMetadata)} does not support writing '{format}' format.");
             }
-
             base.JsonModelWriteCore(writer, options);
-            writer.WritePropertyName("properties"u8);
-            writer.WriteStartObject();
-            if (Optional.IsDefined(ProblemTitle))
-            {
-                writer.WritePropertyName("problemTitle"u8);
-                writer.WriteStringValue(ProblemTitle);
-            }
-            if (Optional.IsDefined(ProblemDescription))
-            {
-                writer.WritePropertyName("problemDescription"u8);
-                writer.WriteStringValue(ProblemDescription);
-            }
-            if (Optional.IsDefined(ServiceId))
-            {
-                writer.WritePropertyName("serviceId"u8);
-                writer.WriteStringValue(ServiceId);
-            }
-            if (Optional.IsDefined(ProblemClassificationId))
+            if (Optional.IsDefined(Properties))
             {
-                writer.WritePropertyName("problemClassificationId"u8);
-                writer.WriteStringValue(ProblemClassificationId);
+                writer.WritePropertyName("properties"u8);
+                writer.WriteObjectValue(Properties, options);
             }
-            if (Optional.IsCollectionDefined(Solutions))
-            {
-                writer.WritePropertyName("solutions"u8);
-                writer.WriteStartArray();
-                foreach (var item in Solutions)
-                {
-                    writer.WriteObjectValue(item, options);
-                }
-                writer.WriteEndArray();
-            }
-            if (Optional.IsCollectionDefined(RelatedServices))
-            {
-                writer.WritePropertyName("relatedServices"u8);
-                writer.WriteStartArray();
-                foreach (var item in RelatedServices)
-                {
-                    writer.WriteObjectValue(item, options);
-                }
-                writer.WriteEndArray();
-            }
-            writer.WriteEndObject();
         }
 
-        SolutionNlpMetadata IJsonModel<SolutionNlpMetadata>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        SolutionNlpMetadata IJsonModel<SolutionNlpMetadata>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => (SolutionNlpMetadata)JsonModelCreateCore(ref reader, options);
+
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual ResourceData JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<SolutionNlpMetadata>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<SolutionNlpMetadata>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(SolutionNlpMetadata)} does not support reading '{format}' format.");
             }
-
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
             return DeserializeSolutionNlpMetadata(document.RootElement, options);
         }
 
-        internal static SolutionNlpMetadata DeserializeSolutionNlpMetadata(JsonElement element, ModelReaderWriterOptions options = null)
+        /// <param name="element"> The JSON element to deserialize. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        internal static SolutionNlpMetadata DeserializeSolutionNlpMetadata(JsonElement element, ModelReaderWriterOptions options)
         {
-            options ??= ModelSerializationExtensions.WireOptions;
-
             if (element.ValueKind == JsonValueKind.Null)
             {
                 return null;
             }
             ResourceIdentifier id = default;
             string name = default;
-            ResourceType type = default;
+            ResourceType resourceType = default;
             SystemData systemData = default;
-            string problemTitle = default;
-            string problemDescription = default;
-            string serviceId = default;
-            string problemClassificationId = default;
-            IList<SolutionMetadataProperties> solutions = default;
-            IList<ClassificationService> relatedServices = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
+            IDictionary<string, BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            SelfHelpNlpSolutions properties = default;
+            foreach (var prop in element.EnumerateObject())
             {
-                if (property.NameEquals("id"u8))
+                if (prop.NameEquals("id"u8))
                 {
-                    id = new ResourceIdentifier(property.Value.GetString());
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    id = new ResourceIdentifier(prop.Value.GetString());
                     continue;
                 }
-                if (property.NameEquals("name"u8))
+                if (prop.NameEquals("name"u8))
                 {
-                    name = property.Value.GetString();
+                    name = prop.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("type"u8))
+                if (prop.NameEquals("type"u8))
                 {
-                    type = new ResourceType(property.Value.GetString());
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    resourceType = new ResourceType(prop.Value.GetString());
                     continue;
                 }
-                if (property.NameEquals("systemData"u8))
+                if (prop.NameEquals("systemData"u8))
                 {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
-                    systemData = ModelReaderWriter.Read<SystemData>(new BinaryData(Encoding.UTF8.GetBytes(property.Value.GetRawText())), ModelSerializationExtensions.WireOptions, AzureResourceManagerSelfHelpContext.Default);
+                    systemData = ModelReaderWriter.Read<SystemData>(new BinaryData(Encoding.UTF8.GetBytes(prop.Value.GetRawText())), ModelSerializationExtensions.WireOptions, AzureResourceManagerSelfHelpContext.Default);
                     continue;
                 }
-                if (property.NameEquals("properties"u8))
+                if (prop.NameEquals("properties"u8))
                 {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
-                        property.ThrowNonNullablePropertyIsNull();
                         continue;
                     }
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        if (property0.NameEquals("problemTitle"u8))
-                        {
-                            problemTitle = property0.Value.GetString();
-                            continue;
-                        }
-                        if (property0.NameEquals("problemDescription"u8))
-                        {
-                            problemDescription = property0.Value.GetString();
-                            continue;
-                        }
-                        if (property0.NameEquals("serviceId"u8))
-                        {
-                            serviceId = property0.Value.GetString();
-                            continue;
-                        }
-                        if (property0.NameEquals("problemClassificationId"u8))
-                        {
-                            problemClassificationId = property0.Value.GetString();
-                            continue;
-                        }
-                        if (property0.NameEquals("solutions"u8))
-                        {
-                            if (property0.Value.ValueKind == JsonValueKind.Null)
-                            {
-                                continue;
-                            }
-                            List<SolutionMetadataProperties> array = new List<SolutionMetadataProperties>();
-                            foreach (var item in property0.Value.EnumerateArray())
-                            {
-                                array.Add(SolutionMetadataProperties.DeserializeSolutionMetadataProperties(item, options));
-                            }
-                            solutions = array;
-                            continue;
-                        }
-                        if (property0.NameEquals("relatedServices"u8))
-                        {
-                            if (property0.Value.ValueKind == JsonValueKind.Null)
-                            {
-                                continue;
-                            }
-                            List<ClassificationService> array = new List<ClassificationService>();
-                            foreach (var item in property0.Value.EnumerateArray())
-                            {
-                                array.Add(ClassificationService.DeserializeClassificationService(item, options));
-                            }
-                            relatedServices = array;
-                            continue;
-                        }
-                    }
+                    properties = SelfHelpNlpSolutions.DeserializeSelfHelpNlpSolutions(prop.Value, options);
                     continue;
                 }
                 if (options.Format != "W")
                 {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                    additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText()));
                 }
             }
-            serializedAdditionalRawData = rawDataDictionary;
             return new SolutionNlpMetadata(
                 id,
                 name,
-                type,
+                resourceType,
                 systemData,
-                problemTitle,
-                problemDescription,
-                serviceId,
-                problemClassificationId,
-                solutions ?? new ChangeTrackingList<SolutionMetadataProperties>(),
-                relatedServices ?? new ChangeTrackingList<ClassificationService>(),
-                serializedAdditionalRawData);
+                additionalBinaryDataProperties,
+                properties);
         }
 
-        BinaryData IPersistableModel<SolutionNlpMetadata>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SolutionNlpMetadata>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="options"> The client options for reading and writing models. </param>
+        BinaryData IPersistableModel<SolutionNlpMetadata>.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
 
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SolutionNlpMetadata>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
@@ -233,15 +149,20 @@ BinaryData IPersistableModel<SolutionNlpMetadata>.Write(ModelReaderWriterOptions
             }
         }
 
-        SolutionNlpMetadata IPersistableModel<SolutionNlpMetadata>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SolutionNlpMetadata>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        SolutionNlpMetadata IPersistableModel<SolutionNlpMetadata>.Create(BinaryData data, ModelReaderWriterOptions options) => (SolutionNlpMetadata)PersistableModelCreateCore(data, options);
 
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual ResourceData PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SolutionNlpMetadata>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
+                    using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
                     {
-                        using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
                         return DeserializeSolutionNlpMetadata(document.RootElement, options);
                     }
                 default:
@@ -249,6 +170,7 @@ SolutionNlpMetadata IPersistableModel<SolutionNlpMetadata>.Create(BinaryData dat
             }
         }
 
+        /// <param name="options"> The client options for reading and writing models. </param>
         string IPersistableModel<SolutionNlpMetadata>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionNlpMetadata.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionNlpMetadata.cs
index c67ca876d510..b8f6ec62ed84 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionNlpMetadata.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionNlpMetadata.cs
@@ -15,79 +15,122 @@ namespace Azure.ResourceManager.SelfHelp.Models
     /// <summary> Nlp Metadata resource. </summary>
     public partial class SolutionNlpMetadata : ResourceData
     {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+        /// <summary> Keeps track of any properties unknown to the library. </summary>
+        private protected readonly IDictionary<string, BinaryData> _additionalBinaryDataProperties;
 
         /// <summary> Initializes a new instance of <see cref="SolutionNlpMetadata"/>. </summary>
         public SolutionNlpMetadata()
         {
-            Solutions = new ChangeTrackingList<SolutionMetadataProperties>();
-            RelatedServices = new ChangeTrackingList<ClassificationService>();
         }
 
         /// <summary> Initializes a new instance of <see cref="SolutionNlpMetadata"/>. </summary>
-        /// <param name="id"> The id. </param>
-        /// <param name="name"> The name. </param>
-        /// <param name="resourceType"> The resourceType. </param>
-        /// <param name="systemData"> The systemData. </param>
-        /// <param name="problemTitle"> Title of the problem classification. </param>
-        /// <param name="problemDescription"> Description of the problem classification. </param>
-        /// <param name="serviceId"> Id of the service (https://learn.microsoft.com/en-us/rest/api/support/services?view=rest-support-2020-04-01) that may be used to create a support ticket. </param>
-        /// <param name="problemClassificationId"> Id of the ProblemClassification (https://learn.microsoft.com/en-us/rest/api/support/problem-classifications?view=rest-support-2020-04-01) that may be used to create a support ticket. </param>
-        /// <param name="solutions"> The list of solution metadata. </param>
-        /// <param name="relatedServices"> The set of services that are most likely related to the request. If relatedServices is included in the response then solutions may not be discovered until the client calls a second time specifying one of the service Ids in the relatedServices object. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal SolutionNlpMetadata(ResourceIdentifier id, string name, ResourceType resourceType, SystemData systemData, string problemTitle, string problemDescription, string serviceId, string problemClassificationId, IList<SolutionMetadataProperties> solutions, IList<ClassificationService> relatedServices, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(id, name, resourceType, systemData)
+        /// <param name="id"> Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. </param>
+        /// <param name="name"> The name of the resource. </param>
+        /// <param name="resourceType"> The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts". </param>
+        /// <param name="systemData"> Azure Resource Manager metadata containing createdBy and modifiedBy information. </param>
+        /// <param name="additionalBinaryDataProperties"> Keeps track of any properties unknown to the library. </param>
+        /// <param name="properties"> Solution metadata Resource properties. </param>
+        internal SolutionNlpMetadata(ResourceIdentifier id, string name, ResourceType resourceType, SystemData systemData, IDictionary<string, BinaryData> additionalBinaryDataProperties, SelfHelpNlpSolutions properties) : base(id, name, resourceType, systemData)
         {
-            ProblemTitle = problemTitle;
-            ProblemDescription = problemDescription;
-            ServiceId = serviceId;
-            ProblemClassificationId = problemClassificationId;
-            Solutions = solutions;
-            RelatedServices = relatedServices;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
+            _additionalBinaryDataProperties = additionalBinaryDataProperties;
+            Properties = properties;
         }
 
+        /// <summary> Solution metadata Resource properties. </summary>
+        internal SelfHelpNlpSolutions Properties { get; set; }
+
         /// <summary> Title of the problem classification. </summary>
-        public string ProblemTitle { get; set; }
+        public string ProblemTitle
+        {
+            get
+            {
+                return Properties is null ? default : Properties.ProblemTitle;
+            }
+            set
+            {
+                if (Properties is null)
+                {
+                    Properties = new SelfHelpNlpSolutions();
+                }
+                Properties.ProblemTitle = value;
+            }
+        }
+
         /// <summary> Description of the problem classification. </summary>
-        public string ProblemDescription { get; set; }
+        public string ProblemDescription
+        {
+            get
+            {
+                return Properties is null ? default : Properties.ProblemDescription;
+            }
+            set
+            {
+                if (Properties is null)
+                {
+                    Properties = new SelfHelpNlpSolutions();
+                }
+                Properties.ProblemDescription = value;
+            }
+        }
+
         /// <summary> Id of the service (https://learn.microsoft.com/en-us/rest/api/support/services?view=rest-support-2020-04-01) that may be used to create a support ticket. </summary>
-        public string ServiceId { get; set; }
+        public string ServiceId
+        {
+            get
+            {
+                return Properties is null ? default : Properties.ServiceId;
+            }
+            set
+            {
+                if (Properties is null)
+                {
+                    Properties = new SelfHelpNlpSolutions();
+                }
+                Properties.ServiceId = value;
+            }
+        }
+
         /// <summary> Id of the ProblemClassification (https://learn.microsoft.com/en-us/rest/api/support/problem-classifications?view=rest-support-2020-04-01) that may be used to create a support ticket. </summary>
-        public string ProblemClassificationId { get; set; }
+        public string ProblemClassificationId
+        {
+            get
+            {
+                return Properties is null ? default : Properties.ProblemClassificationId;
+            }
+            set
+            {
+                if (Properties is null)
+                {
+                    Properties = new SelfHelpNlpSolutions();
+                }
+                Properties.ProblemClassificationId = value;
+            }
+        }
+
         /// <summary> The list of solution metadata. </summary>
-        public IList<SolutionMetadataProperties> Solutions { get; }
+        public IList<SolutionMetadataProperties> Solutions
+        {
+            get
+            {
+                if (Properties is null)
+                {
+                    Properties = new SelfHelpNlpSolutions();
+                }
+                return Properties.Solutions;
+            }
+        }
+
         /// <summary> The set of services that are most likely related to the request. If relatedServices is included in the response then solutions may not be discovered until the client calls a second time specifying one of the service Ids in the relatedServices object. </summary>
-        public IList<ClassificationService> RelatedServices { get; }
+        public IList<ClassificationService> RelatedServices
+        {
+            get
+            {
+                if (Properties is null)
+                {
+                    Properties = new SelfHelpNlpSolutions();
+                }
+                return Properties.RelatedServices;
+            }
+        }
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionProvisioningState.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionProvisioningState.cs
index e037819aeac0..077bbf0f1588 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionProvisioningState.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionProvisioningState.cs
@@ -7,6 +7,7 @@
 
 using System;
 using System.ComponentModel;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
@@ -14,47 +15,72 @@ namespace Azure.ResourceManager.SelfHelp.Models
     public readonly partial struct SolutionProvisioningState : IEquatable<SolutionProvisioningState>
     {
         private readonly string _value;
+        /// <summary> All Solutions in the Batch succeeded. </summary>
+        private const string SucceededValue = "Succeeded";
+        /// <summary> Some Solutions are still running or failed. </summary>
+        private const string PartialCompleteValue = "PartialComplete";
+        /// <summary> All Solutions failed to run. </summary>
+        private const string FailedValue = "Failed";
+        /// <summary> All Solutions are still running. </summary>
+        private const string RunningValue = "Running";
+        /// <summary> When Solutions request gets canceled. </summary>
+        private const string CanceledValue = "Canceled";
 
         /// <summary> Initializes a new instance of <see cref="SolutionProvisioningState"/>. </summary>
+        /// <param name="value"> The value. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
         public SolutionProvisioningState(string value)
         {
-            _value = value ?? throw new ArgumentNullException(nameof(value));
-        }
+            Argument.AssertNotNull(value, nameof(value));
 
-        private const string SucceededValue = "Succeeded";
-        private const string PartialCompleteValue = "PartialComplete";
-        private const string FailedValue = "Failed";
-        private const string RunningValue = "Running";
-        private const string CanceledValue = "Canceled";
+            _value = value;
+        }
 
         /// <summary> All Solutions in the Batch succeeded. </summary>
         public static SolutionProvisioningState Succeeded { get; } = new SolutionProvisioningState(SucceededValue);
+
         /// <summary> Some Solutions are still running or failed. </summary>
         public static SolutionProvisioningState PartialComplete { get; } = new SolutionProvisioningState(PartialCompleteValue);
+
         /// <summary> All Solutions failed to run. </summary>
         public static SolutionProvisioningState Failed { get; } = new SolutionProvisioningState(FailedValue);
+
         /// <summary> All Solutions are still running. </summary>
         public static SolutionProvisioningState Running { get; } = new SolutionProvisioningState(RunningValue);
+
         /// <summary> When Solutions request gets canceled. </summary>
         public static SolutionProvisioningState Canceled { get; } = new SolutionProvisioningState(CanceledValue);
+
         /// <summary> Determines if two <see cref="SolutionProvisioningState"/> values are the same. </summary>
+        /// <param name="left"> The left value to compare. </param>
+        /// <param name="right"> The right value to compare. </param>
         public static bool operator ==(SolutionProvisioningState left, SolutionProvisioningState right) => left.Equals(right);
+
         /// <summary> Determines if two <see cref="SolutionProvisioningState"/> values are not the same. </summary>
+        /// <param name="left"> The left value to compare. </param>
+        /// <param name="right"> The right value to compare. </param>
         public static bool operator !=(SolutionProvisioningState left, SolutionProvisioningState right) => !left.Equals(right);
-        /// <summary> Converts a <see cref="string"/> to a <see cref="SolutionProvisioningState"/>. </summary>
+
+        /// <summary> Converts a string to a <see cref="SolutionProvisioningState"/>. </summary>
+        /// <param name="value"> The value. </param>
         public static implicit operator SolutionProvisioningState(string value) => new SolutionProvisioningState(value);
 
-        /// <inheritdoc />
+        /// <summary> Converts a string to a <see cref="SolutionProvisioningState"/>. </summary>
+        /// <param name="value"> The value. </param>
+        public static implicit operator SolutionProvisioningState?(string value) => value == null ? null : new SolutionProvisioningState(value);
+
+        /// <inheritdoc/>
         [EditorBrowsable(EditorBrowsableState.Never)]
         public override bool Equals(object obj) => obj is SolutionProvisioningState other && Equals(other);
-        /// <inheritdoc />
+
+        /// <inheritdoc/>
         public bool Equals(SolutionProvisioningState other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
 
-        /// <inheritdoc />
+        /// <inheritdoc/>
         [EditorBrowsable(EditorBrowsableState.Never)]
         public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
-        /// <inheritdoc />
+
+        /// <inheritdoc/>
         public override string ToString() => _value;
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionReplacementMaps.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionReplacementMaps.Serialization.cs
index 79f44940733f..ac2ebfcdb70d 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionReplacementMaps.Serialization.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionReplacementMaps.Serialization.cs
@@ -9,14 +9,15 @@
 using System.ClientModel.Primitives;
 using System.Collections.Generic;
 using System.Text.Json;
-using Azure.Core;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
-    public partial class SolutionReplacementMaps : IUtf8JsonSerializable, IJsonModel<SolutionReplacementMaps>
+    /// <summary> Solution replacement maps. </summary>
+    public partial class SolutionReplacementMaps : IJsonModel<SolutionReplacementMaps>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<SolutionReplacementMaps>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
+        /// <param name="writer"> The JSON writer. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
         void IJsonModel<SolutionReplacementMaps>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
@@ -28,17 +29,16 @@ void IJsonModel<SolutionReplacementMaps>.Write(Utf8JsonWriter writer, ModelReade
         /// <param name="options"> The client options for reading and writing models. </param>
         protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<SolutionReplacementMaps>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<SolutionReplacementMaps>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(SolutionReplacementMaps)} does not support writing '{format}' format.");
             }
-
             if (Optional.IsCollectionDefined(WebResults))
             {
                 writer.WritePropertyName("webResults"u8);
                 writer.WriteStartArray();
-                foreach (var item in WebResults)
+                foreach (KBWebResult item in WebResults)
                 {
                     writer.WriteObjectValue(item, options);
                 }
@@ -48,7 +48,7 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             {
                 writer.WritePropertyName("diagnostics"u8);
                 writer.WriteStartArray();
-                foreach (var item in Diagnostics)
+                foreach (SolutionsDiagnostic item in Diagnostics)
                 {
                     writer.WriteObjectValue(item, options);
                 }
@@ -58,7 +58,7 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             {
                 writer.WritePropertyName("troubleshooters"u8);
                 writer.WriteStartArray();
-                foreach (var item in Troubleshooters)
+                foreach (SolutionsTroubleshooters item in Troubleshooters)
                 {
                     writer.WriteObjectValue(item, options);
                 }
@@ -68,7 +68,7 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             {
                 writer.WritePropertyName("metricsBasedCharts"u8);
                 writer.WriteStartArray();
-                foreach (var item in MetricsBasedCharts)
+                foreach (MetricsBasedChart item in MetricsBasedCharts)
                 {
                     writer.WriteObjectValue(item, options);
                 }
@@ -78,7 +78,7 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             {
                 writer.WritePropertyName("videos"u8);
                 writer.WriteStartArray();
-                foreach (var item in Videos)
+                foreach (SelfHelpVideo item in Videos)
                 {
                     writer.WriteObjectValue(item, options);
                 }
@@ -88,21 +88,21 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             {
                 writer.WritePropertyName("videoGroups"u8);
                 writer.WriteStartArray();
-                foreach (var item in VideoGroups)
+                foreach (VideoGroupDetail item in VideoGroups)
                 {
                     writer.WriteObjectValue(item, options);
                 }
                 writer.WriteEndArray();
             }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            if (options.Format != "W" && _additionalBinaryDataProperties != null)
             {
-                foreach (var item in _serializedAdditionalRawData)
+                foreach (var item in _additionalBinaryDataProperties)
                 {
                     writer.WritePropertyName(item.Key);
 #if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
+                    writer.WriteRawValue(item.Value);
 #else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value, ModelSerializationExtensions.JsonDocumentOptions))
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
                     {
                         JsonSerializer.Serialize(writer, document.RootElement);
                     }
@@ -111,114 +111,118 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             }
         }
 
-        SolutionReplacementMaps IJsonModel<SolutionReplacementMaps>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        SolutionReplacementMaps IJsonModel<SolutionReplacementMaps>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options);
+
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual SolutionReplacementMaps JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<SolutionReplacementMaps>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<SolutionReplacementMaps>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(SolutionReplacementMaps)} does not support reading '{format}' format.");
             }
-
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
             return DeserializeSolutionReplacementMaps(document.RootElement, options);
         }
 
-        internal static SolutionReplacementMaps DeserializeSolutionReplacementMaps(JsonElement element, ModelReaderWriterOptions options = null)
+        /// <param name="element"> The JSON element to deserialize. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        internal static SolutionReplacementMaps DeserializeSolutionReplacementMaps(JsonElement element, ModelReaderWriterOptions options)
         {
-            options ??= ModelSerializationExtensions.WireOptions;
-
             if (element.ValueKind == JsonValueKind.Null)
             {
                 return null;
             }
-            IReadOnlyList<KBWebResult> webResults = default;
-            IReadOnlyList<SolutionsDiagnostic> diagnostics = default;
-            IReadOnlyList<SolutionsTroubleshooters> troubleshooters = default;
-            IReadOnlyList<MetricsBasedChart> metricsBasedCharts = default;
-            IReadOnlyList<SelfHelpVideo> videos = default;
-            IReadOnlyList<VideoGroupDetail> videoGroups = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
+            IList<KBWebResult> webResults = default;
+            IList<SolutionsDiagnostic> diagnostics = default;
+            IList<SolutionsTroubleshooters> troubleshooters = default;
+            IList<MetricsBasedChart> metricsBasedCharts = default;
+            IList<SelfHelpVideo> videos = default;
+            IList<VideoGroupDetail> videoGroups = default;
+            IDictionary<string, BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            foreach (var prop in element.EnumerateObject())
             {
-                if (property.NameEquals("webResults"u8))
+                if (prop.NameEquals("webResults"u8))
                 {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
                     List<KBWebResult> array = new List<KBWebResult>();
-                    foreach (var item in property.Value.EnumerateArray())
+                    foreach (var item in prop.Value.EnumerateArray())
                     {
                         array.Add(KBWebResult.DeserializeKBWebResult(item, options));
                     }
                     webResults = array;
                     continue;
                 }
-                if (property.NameEquals("diagnostics"u8))
+                if (prop.NameEquals("diagnostics"u8))
                 {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
                     List<SolutionsDiagnostic> array = new List<SolutionsDiagnostic>();
-                    foreach (var item in property.Value.EnumerateArray())
+                    foreach (var item in prop.Value.EnumerateArray())
                     {
                         array.Add(SolutionsDiagnostic.DeserializeSolutionsDiagnostic(item, options));
                     }
                     diagnostics = array;
                     continue;
                 }
-                if (property.NameEquals("troubleshooters"u8))
+                if (prop.NameEquals("troubleshooters"u8))
                 {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
                     List<SolutionsTroubleshooters> array = new List<SolutionsTroubleshooters>();
-                    foreach (var item in property.Value.EnumerateArray())
+                    foreach (var item in prop.Value.EnumerateArray())
                     {
                         array.Add(SolutionsTroubleshooters.DeserializeSolutionsTroubleshooters(item, options));
                     }
                     troubleshooters = array;
                     continue;
                 }
-                if (property.NameEquals("metricsBasedCharts"u8))
+                if (prop.NameEquals("metricsBasedCharts"u8))
                 {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
                     List<MetricsBasedChart> array = new List<MetricsBasedChart>();
-                    foreach (var item in property.Value.EnumerateArray())
+                    foreach (var item in prop.Value.EnumerateArray())
                     {
                         array.Add(MetricsBasedChart.DeserializeMetricsBasedChart(item, options));
                     }
                     metricsBasedCharts = array;
                     continue;
                 }
-                if (property.NameEquals("videos"u8))
+                if (prop.NameEquals("videos"u8))
                 {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
                     List<SelfHelpVideo> array = new List<SelfHelpVideo>();
-                    foreach (var item in property.Value.EnumerateArray())
+                    foreach (var item in prop.Value.EnumerateArray())
                     {
                         array.Add(SelfHelpVideo.DeserializeSelfHelpVideo(item, options));
                     }
                     videos = array;
                     continue;
                 }
-                if (property.NameEquals("videoGroups"u8))
+                if (prop.NameEquals("videoGroups"u8))
                 {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
                     List<VideoGroupDetail> array = new List<VideoGroupDetail>();
-                    foreach (var item in property.Value.EnumerateArray())
+                    foreach (var item in prop.Value.EnumerateArray())
                     {
                         array.Add(VideoGroupDetail.DeserializeVideoGroupDetail(item, options));
                     }
@@ -227,10 +231,9 @@ internal static SolutionReplacementMaps DeserializeSolutionReplacementMaps(JsonE
                 }
                 if (options.Format != "W")
                 {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                    additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText()));
                 }
             }
-            serializedAdditionalRawData = rawDataDictionary;
             return new SolutionReplacementMaps(
                 webResults ?? new ChangeTrackingList<KBWebResult>(),
                 diagnostics ?? new ChangeTrackingList<SolutionsDiagnostic>(),
@@ -238,13 +241,16 @@ internal static SolutionReplacementMaps DeserializeSolutionReplacementMaps(JsonE
                 metricsBasedCharts ?? new ChangeTrackingList<MetricsBasedChart>(),
                 videos ?? new ChangeTrackingList<SelfHelpVideo>(),
                 videoGroups ?? new ChangeTrackingList<VideoGroupDetail>(),
-                serializedAdditionalRawData);
+                additionalBinaryDataProperties);
         }
 
-        BinaryData IPersistableModel<SolutionReplacementMaps>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SolutionReplacementMaps>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="options"> The client options for reading and writing models. </param>
+        BinaryData IPersistableModel<SolutionReplacementMaps>.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
 
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SolutionReplacementMaps>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
@@ -254,15 +260,20 @@ BinaryData IPersistableModel<SolutionReplacementMaps>.Write(ModelReaderWriterOpt
             }
         }
 
-        SolutionReplacementMaps IPersistableModel<SolutionReplacementMaps>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SolutionReplacementMaps>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        SolutionReplacementMaps IPersistableModel<SolutionReplacementMaps>.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options);
 
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual SolutionReplacementMaps PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SolutionReplacementMaps>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
+                    using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
                     {
-                        using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
                         return DeserializeSolutionReplacementMaps(document.RootElement, options);
                     }
                 default:
@@ -270,6 +281,7 @@ SolutionReplacementMaps IPersistableModel<SolutionReplacementMaps>.Create(Binary
             }
         }
 
+        /// <param name="options"> The client options for reading and writing models. </param>
         string IPersistableModel<SolutionReplacementMaps>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionReplacementMaps.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionReplacementMaps.cs
index ce0e91ba70ef..fba5b60252b9 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionReplacementMaps.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionReplacementMaps.cs
@@ -7,43 +7,15 @@
 
 using System;
 using System.Collections.Generic;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
     /// <summary> Solution replacement maps. </summary>
     public partial class SolutionReplacementMaps
     {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+        /// <summary> Keeps track of any properties unknown to the library. </summary>
+        private protected readonly IDictionary<string, BinaryData> _additionalBinaryDataProperties;
 
         /// <summary> Initializes a new instance of <see cref="SolutionReplacementMaps"/>. </summary>
         internal SolutionReplacementMaps()
@@ -63,8 +35,8 @@ internal SolutionReplacementMaps()
         /// <param name="metricsBasedCharts"> Solution metrics based charts. </param>
         /// <param name="videos"> Video solutions, which have the power to engage the customer by stimulating their senses. </param>
         /// <param name="videoGroups"> Group of Videos. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal SolutionReplacementMaps(IReadOnlyList<KBWebResult> webResults, IReadOnlyList<SolutionsDiagnostic> diagnostics, IReadOnlyList<SolutionsTroubleshooters> troubleshooters, IReadOnlyList<MetricsBasedChart> metricsBasedCharts, IReadOnlyList<SelfHelpVideo> videos, IReadOnlyList<VideoGroupDetail> videoGroups, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        /// <param name="additionalBinaryDataProperties"> Keeps track of any properties unknown to the library. </param>
+        internal SolutionReplacementMaps(IList<KBWebResult> webResults, IList<SolutionsDiagnostic> diagnostics, IList<SolutionsTroubleshooters> troubleshooters, IList<MetricsBasedChart> metricsBasedCharts, IList<SelfHelpVideo> videos, IList<VideoGroupDetail> videoGroups, IDictionary<string, BinaryData> additionalBinaryDataProperties)
         {
             WebResults = webResults;
             Diagnostics = diagnostics;
@@ -72,20 +44,25 @@ internal SolutionReplacementMaps(IReadOnlyList<KBWebResult> webResults, IReadOnl
             MetricsBasedCharts = metricsBasedCharts;
             Videos = videos;
             VideoGroups = videoGroups;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
+            _additionalBinaryDataProperties = additionalBinaryDataProperties;
         }
 
         /// <summary> Solution AzureKB results. </summary>
-        public IReadOnlyList<KBWebResult> WebResults { get; }
+        public IList<KBWebResult> WebResults { get; }
+
         /// <summary> Solution diagnostics results. </summary>
-        public IReadOnlyList<SolutionsDiagnostic> Diagnostics { get; }
+        public IList<SolutionsDiagnostic> Diagnostics { get; }
+
         /// <summary> Solutions Troubleshooters. </summary>
-        public IReadOnlyList<SolutionsTroubleshooters> Troubleshooters { get; }
+        public IList<SolutionsTroubleshooters> Troubleshooters { get; }
+
         /// <summary> Solution metrics based charts. </summary>
-        public IReadOnlyList<MetricsBasedChart> MetricsBasedCharts { get; }
+        public IList<MetricsBasedChart> MetricsBasedCharts { get; }
+
         /// <summary> Video solutions, which have the power to engage the customer by stimulating their senses. </summary>
-        public IReadOnlyList<SelfHelpVideo> Videos { get; }
+        public IList<SelfHelpVideo> Videos { get; }
+
         /// <summary> Group of Videos. </summary>
-        public IReadOnlyList<VideoGroupDetail> VideoGroups { get; }
+        public IList<VideoGroupDetail> VideoGroups { get; }
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionResourceProperties.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionResourceProperties.Serialization.cs
new file mode 100644
index 000000000000..0fa90b60edc8
--- /dev/null
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionResourceProperties.Serialization.cs
@@ -0,0 +1,290 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.ResourceManager.SelfHelp;
+
+namespace Azure.ResourceManager.SelfHelp.Models
+{
+    /// <summary> Solution result. </summary>
+    internal partial class SolutionResourceProperties : IJsonModel<SolutionResourceProperties>
+    {
+        /// <param name="writer"> The JSON writer. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        void IJsonModel<SolutionResourceProperties>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            writer.WriteStartObject();
+            JsonModelWriteCore(writer, options);
+            writer.WriteEndObject();
+        }
+
+        /// <param name="writer"> The JSON writer. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SolutionResourceProperties>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(SolutionResourceProperties)} does not support writing '{format}' format.");
+            }
+            if (Optional.IsCollectionDefined(TriggerCriteria))
+            {
+                writer.WritePropertyName("triggerCriteria"u8);
+                writer.WriteStartArray();
+                foreach (SolutionTriggerCriterion item in TriggerCriteria)
+                {
+                    writer.WriteObjectValue(item, options);
+                }
+                writer.WriteEndArray();
+            }
+            if (Optional.IsCollectionDefined(Parameters))
+            {
+                writer.WritePropertyName("parameters"u8);
+                writer.WriteStartObject();
+                foreach (var item in Parameters)
+                {
+                    writer.WritePropertyName(item.Key);
+                    if (item.Value == null)
+                    {
+                        writer.WriteNullValue();
+                        continue;
+                    }
+                    writer.WriteStringValue(item.Value);
+                }
+                writer.WriteEndObject();
+            }
+            if (options.Format != "W" && Optional.IsDefined(SolutionId))
+            {
+                writer.WritePropertyName("solutionId"u8);
+                writer.WriteStringValue(SolutionId);
+            }
+            if (options.Format != "W" && Optional.IsDefined(ProvisioningState))
+            {
+                writer.WritePropertyName("provisioningState"u8);
+                writer.WriteStringValue(ProvisioningState.Value.ToString());
+            }
+            if (options.Format != "W" && Optional.IsDefined(Title))
+            {
+                writer.WritePropertyName("title"u8);
+                writer.WriteStringValue(Title);
+            }
+            if (options.Format != "W" && Optional.IsDefined(Content))
+            {
+                writer.WritePropertyName("content"u8);
+                writer.WriteStringValue(Content);
+            }
+            if (options.Format != "W" && Optional.IsDefined(ReplacementMaps))
+            {
+                writer.WritePropertyName("replacementMaps"u8);
+                writer.WriteObjectValue(ReplacementMaps, options);
+            }
+            if (options.Format != "W" && Optional.IsCollectionDefined(Sections))
+            {
+                writer.WritePropertyName("sections"u8);
+                writer.WriteStartArray();
+                foreach (SelfHelpSection item in Sections)
+                {
+                    writer.WriteObjectValue(item, options);
+                }
+                writer.WriteEndArray();
+            }
+            if (options.Format != "W" && _additionalBinaryDataProperties != null)
+            {
+                foreach (var item in _additionalBinaryDataProperties)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+                    writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+        }
+
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        SolutionResourceProperties IJsonModel<SolutionResourceProperties>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options);
+
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual SolutionResourceProperties JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SolutionResourceProperties>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(SolutionResourceProperties)} does not support reading '{format}' format.");
+            }
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeSolutionResourceProperties(document.RootElement, options);
+        }
+
+        /// <param name="element"> The JSON element to deserialize. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        internal static SolutionResourceProperties DeserializeSolutionResourceProperties(JsonElement element, ModelReaderWriterOptions options)
+        {
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            IList<SolutionTriggerCriterion> triggerCriteria = default;
+            IDictionary<string, string> parameters = default;
+            string solutionId = default;
+            SolutionProvisioningState? provisioningState = default;
+            string title = default;
+            string content = default;
+            SolutionReplacementMaps replacementMaps = default;
+            IReadOnlyList<SelfHelpSection> sections = default;
+            IDictionary<string, BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            foreach (var prop in element.EnumerateObject())
+            {
+                if (prop.NameEquals("triggerCriteria"u8))
+                {
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    List<SolutionTriggerCriterion> array = new List<SolutionTriggerCriterion>();
+                    foreach (var item in prop.Value.EnumerateArray())
+                    {
+                        array.Add(SolutionTriggerCriterion.DeserializeSolutionTriggerCriterion(item, options));
+                    }
+                    triggerCriteria = array;
+                    continue;
+                }
+                if (prop.NameEquals("parameters"u8))
+                {
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
+                    foreach (var prop0 in prop.Value.EnumerateObject())
+                    {
+                        if (prop0.Value.ValueKind == JsonValueKind.Null)
+                        {
+                            dictionary.Add(prop0.Name, null);
+                        }
+                        else
+                        {
+                            dictionary.Add(prop0.Name, prop0.Value.GetString());
+                        }
+                    }
+                    parameters = dictionary;
+                    continue;
+                }
+                if (prop.NameEquals("solutionId"u8))
+                {
+                    solutionId = prop.Value.GetString();
+                    continue;
+                }
+                if (prop.NameEquals("provisioningState"u8))
+                {
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    provisioningState = new SolutionProvisioningState(prop.Value.GetString());
+                    continue;
+                }
+                if (prop.NameEquals("title"u8))
+                {
+                    title = prop.Value.GetString();
+                    continue;
+                }
+                if (prop.NameEquals("content"u8))
+                {
+                    content = prop.Value.GetString();
+                    continue;
+                }
+                if (prop.NameEquals("replacementMaps"u8))
+                {
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    replacementMaps = SolutionReplacementMaps.DeserializeSolutionReplacementMaps(prop.Value, options);
+                    continue;
+                }
+                if (prop.NameEquals("sections"u8))
+                {
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    List<SelfHelpSection> array = new List<SelfHelpSection>();
+                    foreach (var item in prop.Value.EnumerateArray())
+                    {
+                        array.Add(SelfHelpSection.DeserializeSelfHelpSection(item, options));
+                    }
+                    sections = array;
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText()));
+                }
+            }
+            return new SolutionResourceProperties(
+                triggerCriteria ?? new ChangeTrackingList<SolutionTriggerCriterion>(),
+                parameters ?? new ChangeTrackingDictionary<string, string>(),
+                solutionId,
+                provisioningState,
+                title,
+                content,
+                replacementMaps,
+                sections ?? new ChangeTrackingList<SelfHelpSection>(),
+                additionalBinaryDataProperties);
+        }
+
+        /// <param name="options"> The client options for reading and writing models. </param>
+        BinaryData IPersistableModel<SolutionResourceProperties>.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
+
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SolutionResourceProperties>)this).GetFormatFromOptions(options) : options.Format;
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options, AzureResourceManagerSelfHelpContext.Default);
+                default:
+                    throw new FormatException($"The model {nameof(SolutionResourceProperties)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        SolutionResourceProperties IPersistableModel<SolutionResourceProperties>.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options);
+
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual SolutionResourceProperties PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SolutionResourceProperties>)this).GetFormatFromOptions(options) : options.Format;
+            switch (format)
+            {
+                case "J":
+                    using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
+                    {
+                        return DeserializeSolutionResourceProperties(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(SolutionResourceProperties)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        /// <param name="options"> The client options for reading and writing models. </param>
+        string IPersistableModel<SolutionResourceProperties>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+    }
+}
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionResourceProperties.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionResourceProperties.cs
new file mode 100644
index 000000000000..8981e6c98e4b
--- /dev/null
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionResourceProperties.cs
@@ -0,0 +1,75 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+using Azure.ResourceManager.SelfHelp;
+
+namespace Azure.ResourceManager.SelfHelp.Models
+{
+    /// <summary> Solution result. </summary>
+    internal partial class SolutionResourceProperties
+    {
+        /// <summary> Keeps track of any properties unknown to the library. </summary>
+        private protected readonly IDictionary<string, BinaryData> _additionalBinaryDataProperties;
+
+        /// <summary> Initializes a new instance of <see cref="SolutionResourceProperties"/>. </summary>
+        public SolutionResourceProperties()
+        {
+            TriggerCriteria = new ChangeTrackingList<SolutionTriggerCriterion>();
+            Parameters = new ChangeTrackingDictionary<string, string>();
+            Sections = new ChangeTrackingList<SelfHelpSection>();
+        }
+
+        /// <summary> Initializes a new instance of <see cref="SolutionResourceProperties"/>. </summary>
+        /// <param name="triggerCriteria"> Solution request trigger criteria. </param>
+        /// <param name="parameters"> Client input parameters to run Solution. </param>
+        /// <param name="solutionId"> Solution Id to identify single solution. </param>
+        /// <param name="provisioningState"> Status of solution provisioning. </param>
+        /// <param name="title"> The title. </param>
+        /// <param name="content"> The HTML content that needs to be rendered and shown to customer. </param>
+        /// <param name="replacementMaps"> Solution replacement maps. </param>
+        /// <param name="sections"> List of section object. </param>
+        /// <param name="additionalBinaryDataProperties"> Keeps track of any properties unknown to the library. </param>
+        internal SolutionResourceProperties(IList<SolutionTriggerCriterion> triggerCriteria, IDictionary<string, string> parameters, string solutionId, SolutionProvisioningState? provisioningState, string title, string content, SolutionReplacementMaps replacementMaps, IReadOnlyList<SelfHelpSection> sections, IDictionary<string, BinaryData> additionalBinaryDataProperties)
+        {
+            TriggerCriteria = triggerCriteria;
+            Parameters = parameters;
+            SolutionId = solutionId;
+            ProvisioningState = provisioningState;
+            Title = title;
+            Content = content;
+            ReplacementMaps = replacementMaps;
+            Sections = sections;
+            _additionalBinaryDataProperties = additionalBinaryDataProperties;
+        }
+
+        /// <summary> Solution request trigger criteria. </summary>
+        public IList<SolutionTriggerCriterion> TriggerCriteria { get; } = new ChangeTrackingList<SolutionTriggerCriterion>();
+
+        /// <summary> Client input parameters to run Solution. </summary>
+        public IDictionary<string, string> Parameters { get; } = new ChangeTrackingDictionary<string, string>();
+
+        /// <summary> Solution Id to identify single solution. </summary>
+        public string SolutionId { get; }
+
+        /// <summary> Status of solution provisioning. </summary>
+        public SolutionProvisioningState? ProvisioningState { get; }
+
+        /// <summary> The title. </summary>
+        public string Title { get; }
+
+        /// <summary> The HTML content that needs to be rendered and shown to customer. </summary>
+        public string Content { get; }
+
+        /// <summary> Solution replacement maps. </summary>
+        public SolutionReplacementMaps ReplacementMaps { get; }
+
+        /// <summary> List of section object. </summary>
+        public IReadOnlyList<SelfHelpSection> Sections { get; } = new ChangeTrackingList<SelfHelpSection>();
+    }
+}
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionSection.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionSection.Serialization.cs
index b689cfa5ccd2..04df40dc0d9c 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionSection.Serialization.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionSection.Serialization.cs
@@ -9,14 +9,15 @@
 using System.ClientModel.Primitives;
 using System.Collections.Generic;
 using System.Text.Json;
-using Azure.Core;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
-    public partial class SolutionSection : IUtf8JsonSerializable, IJsonModel<SolutionSection>
+    /// <summary> Part of the solution and are dividers in the solution rendering. </summary>
+    public partial class SolutionSection : IJsonModel<SolutionSection>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<SolutionSection>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
+        /// <param name="writer"> The JSON writer. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
         void IJsonModel<SolutionSection>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
@@ -28,12 +29,11 @@ void IJsonModel<SolutionSection>.Write(Utf8JsonWriter writer, ModelReaderWriterO
         /// <param name="options"> The client options for reading and writing models. </param>
         protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<SolutionSection>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<SolutionSection>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(SolutionSection)} does not support writing '{format}' format.");
             }
-
             if (Optional.IsDefined(Title))
             {
                 writer.WritePropertyName("title"u8);
@@ -49,15 +49,15 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
                 writer.WritePropertyName("replacementMaps"u8);
                 writer.WriteObjectValue(ReplacementMaps, options);
             }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            if (options.Format != "W" && _additionalBinaryDataProperties != null)
             {
-                foreach (var item in _serializedAdditionalRawData)
+                foreach (var item in _additionalBinaryDataProperties)
                 {
                     writer.WritePropertyName(item.Key);
 #if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
+                    writer.WriteRawValue(item.Value);
 #else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value, ModelSerializationExtensions.JsonDocumentOptions))
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
                     {
                         JsonSerializer.Serialize(writer, document.RootElement);
                     }
@@ -66,22 +66,27 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             }
         }
 
-        SolutionSection IJsonModel<SolutionSection>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        SolutionSection IJsonModel<SolutionSection>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options);
+
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual SolutionSection JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<SolutionSection>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<SolutionSection>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(SolutionSection)} does not support reading '{format}' format.");
             }
-
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
             return DeserializeSolutionSection(document.RootElement, options);
         }
 
-        internal static SolutionSection DeserializeSolutionSection(JsonElement element, ModelReaderWriterOptions options = null)
+        /// <param name="element"> The JSON element to deserialize. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        internal static SolutionSection DeserializeSolutionSection(JsonElement element, ModelReaderWriterOptions options)
         {
-            options ??= ModelSerializationExtensions.WireOptions;
-
             if (element.ValueKind == JsonValueKind.Null)
             {
                 return null;
@@ -89,42 +94,43 @@ internal static SolutionSection DeserializeSolutionSection(JsonElement element,
             string title = default;
             string content = default;
             ReplacementMapsResult replacementMaps = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
+            IDictionary<string, BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            foreach (var prop in element.EnumerateObject())
             {
-                if (property.NameEquals("title"u8))
+                if (prop.NameEquals("title"u8))
                 {
-                    title = property.Value.GetString();
+                    title = prop.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("content"u8))
+                if (prop.NameEquals("content"u8))
                 {
-                    content = property.Value.GetString();
+                    content = prop.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("replacementMaps"u8))
+                if (prop.NameEquals("replacementMaps"u8))
                 {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
-                    replacementMaps = ReplacementMapsResult.DeserializeReplacementMapsResult(property.Value, options);
+                    replacementMaps = ReplacementMapsResult.DeserializeReplacementMapsResult(prop.Value, options);
                     continue;
                 }
                 if (options.Format != "W")
                 {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                    additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText()));
                 }
             }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new SolutionSection(title, content, replacementMaps, serializedAdditionalRawData);
+            return new SolutionSection(title, content, replacementMaps, additionalBinaryDataProperties);
         }
 
-        BinaryData IPersistableModel<SolutionSection>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SolutionSection>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="options"> The client options for reading and writing models. </param>
+        BinaryData IPersistableModel<SolutionSection>.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
 
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SolutionSection>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
@@ -134,15 +140,20 @@ BinaryData IPersistableModel<SolutionSection>.Write(ModelReaderWriterOptions opt
             }
         }
 
-        SolutionSection IPersistableModel<SolutionSection>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SolutionSection>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        SolutionSection IPersistableModel<SolutionSection>.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options);
 
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual SolutionSection PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SolutionSection>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
+                    using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
                     {
-                        using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
                         return DeserializeSolutionSection(document.RootElement, options);
                     }
                 default:
@@ -150,6 +161,7 @@ SolutionSection IPersistableModel<SolutionSection>.Create(BinaryData data, Model
             }
         }
 
+        /// <param name="options"> The client options for reading and writing models. </param>
         string IPersistableModel<SolutionSection>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionSection.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionSection.cs
index e64d54e0a7b0..def687aa18f7 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionSection.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionSection.cs
@@ -13,37 +13,8 @@ namespace Azure.ResourceManager.SelfHelp.Models
     /// <summary> Part of the solution and are dividers in the solution rendering. </summary>
     public partial class SolutionSection
     {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+        /// <summary> Keeps track of any properties unknown to the library. </summary>
+        private protected readonly IDictionary<string, BinaryData> _additionalBinaryDataProperties;
 
         /// <summary> Initializes a new instance of <see cref="SolutionSection"/>. </summary>
         internal SolutionSection()
@@ -54,19 +25,21 @@ internal SolutionSection()
         /// <param name="title"> Solution sections title. </param>
         /// <param name="content"> Solution sections content. </param>
         /// <param name="replacementMaps"> Solution replacement maps. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal SolutionSection(string title, string content, ReplacementMapsResult replacementMaps, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        /// <param name="additionalBinaryDataProperties"> Keeps track of any properties unknown to the library. </param>
+        internal SolutionSection(string title, string content, ReplacementMapsResult replacementMaps, IDictionary<string, BinaryData> additionalBinaryDataProperties)
         {
             Title = title;
             Content = content;
             ReplacementMaps = replacementMaps;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
+            _additionalBinaryDataProperties = additionalBinaryDataProperties;
         }
 
         /// <summary> Solution sections title. </summary>
         public string Title { get; }
+
         /// <summary> Solution sections content. </summary>
         public string Content { get; }
+
         /// <summary> Solution replacement maps. </summary>
         public ReplacementMapsResult ReplacementMaps { get; }
     }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionTriggerCriterion.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionTriggerCriterion.Serialization.cs
index 362f0d4a31bd..0054a6c03bc1 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionTriggerCriterion.Serialization.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionTriggerCriterion.Serialization.cs
@@ -9,14 +9,15 @@
 using System.ClientModel.Primitives;
 using System.Collections.Generic;
 using System.Text.Json;
-using Azure.Core;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
-    public partial class SolutionTriggerCriterion : IUtf8JsonSerializable, IJsonModel<SolutionTriggerCriterion>
+    /// <summary> Solution request trigger criterion. SolutionId/ProblemClassificationId is the only supported trigger type for Solution PUT request. ReplacementKey is the only supported trigger type for Solution PATCH request. </summary>
+    public partial class SolutionTriggerCriterion : IJsonModel<SolutionTriggerCriterion>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<SolutionTriggerCriterion>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
+        /// <param name="writer"> The JSON writer. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
         void IJsonModel<SolutionTriggerCriterion>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
@@ -28,12 +29,11 @@ void IJsonModel<SolutionTriggerCriterion>.Write(Utf8JsonWriter writer, ModelRead
         /// <param name="options"> The client options for reading and writing models. </param>
         protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<SolutionTriggerCriterion>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<SolutionTriggerCriterion>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(SolutionTriggerCriterion)} does not support writing '{format}' format.");
             }
-
             if (Optional.IsDefined(Name))
             {
                 writer.WritePropertyName("name"u8);
@@ -44,15 +44,15 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
                 writer.WritePropertyName("value"u8);
                 writer.WriteStringValue(Value);
             }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            if (options.Format != "W" && _additionalBinaryDataProperties != null)
             {
-                foreach (var item in _serializedAdditionalRawData)
+                foreach (var item in _additionalBinaryDataProperties)
                 {
                     writer.WritePropertyName(item.Key);
 #if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
+                    writer.WriteRawValue(item.Value);
 #else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value, ModelSerializationExtensions.JsonDocumentOptions))
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
                     {
                         JsonSerializer.Serialize(writer, document.RootElement);
                     }
@@ -61,59 +61,65 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             }
         }
 
-        SolutionTriggerCriterion IJsonModel<SolutionTriggerCriterion>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        SolutionTriggerCriterion IJsonModel<SolutionTriggerCriterion>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options);
+
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual SolutionTriggerCriterion JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<SolutionTriggerCriterion>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<SolutionTriggerCriterion>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(SolutionTriggerCriterion)} does not support reading '{format}' format.");
             }
-
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
             return DeserializeSolutionTriggerCriterion(document.RootElement, options);
         }
 
-        internal static SolutionTriggerCriterion DeserializeSolutionTriggerCriterion(JsonElement element, ModelReaderWriterOptions options = null)
+        /// <param name="element"> The JSON element to deserialize. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        internal static SolutionTriggerCriterion DeserializeSolutionTriggerCriterion(JsonElement element, ModelReaderWriterOptions options)
         {
-            options ??= ModelSerializationExtensions.WireOptions;
-
             if (element.ValueKind == JsonValueKind.Null)
             {
                 return null;
             }
             SelfHelpName? name = default;
             string value = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
+            IDictionary<string, BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            foreach (var prop in element.EnumerateObject())
             {
-                if (property.NameEquals("name"u8))
+                if (prop.NameEquals("name"u8))
                 {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
-                    name = new SelfHelpName(property.Value.GetString());
+                    name = new SelfHelpName(prop.Value.GetString());
                     continue;
                 }
-                if (property.NameEquals("value"u8))
+                if (prop.NameEquals("value"u8))
                 {
-                    value = property.Value.GetString();
+                    value = prop.Value.GetString();
                     continue;
                 }
                 if (options.Format != "W")
                 {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                    additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText()));
                 }
             }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new SolutionTriggerCriterion(name, value, serializedAdditionalRawData);
+            return new SolutionTriggerCriterion(name, value, additionalBinaryDataProperties);
         }
 
-        BinaryData IPersistableModel<SolutionTriggerCriterion>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SolutionTriggerCriterion>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="options"> The client options for reading and writing models. </param>
+        BinaryData IPersistableModel<SolutionTriggerCriterion>.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
 
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SolutionTriggerCriterion>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
@@ -123,15 +129,20 @@ BinaryData IPersistableModel<SolutionTriggerCriterion>.Write(ModelReaderWriterOp
             }
         }
 
-        SolutionTriggerCriterion IPersistableModel<SolutionTriggerCriterion>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SolutionTriggerCriterion>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        SolutionTriggerCriterion IPersistableModel<SolutionTriggerCriterion>.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options);
 
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual SolutionTriggerCriterion PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SolutionTriggerCriterion>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
+                    using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
                     {
-                        using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
                         return DeserializeSolutionTriggerCriterion(document.RootElement, options);
                     }
                 default:
@@ -139,6 +150,7 @@ SolutionTriggerCriterion IPersistableModel<SolutionTriggerCriterion>.Create(Bina
             }
         }
 
+        /// <param name="options"> The client options for reading and writing models. </param>
         string IPersistableModel<SolutionTriggerCriterion>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionTriggerCriterion.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionTriggerCriterion.cs
index 4176562eacdb..55b93453138c 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionTriggerCriterion.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionTriggerCriterion.cs
@@ -13,37 +13,8 @@ namespace Azure.ResourceManager.SelfHelp.Models
     /// <summary> Solution request trigger criterion. SolutionId/ProblemClassificationId is the only supported trigger type for Solution PUT request. ReplacementKey is the only supported trigger type for Solution PATCH request. </summary>
     public partial class SolutionTriggerCriterion
     {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+        /// <summary> Keeps track of any properties unknown to the library. </summary>
+        private protected readonly IDictionary<string, BinaryData> _additionalBinaryDataProperties;
 
         /// <summary> Initializes a new instance of <see cref="SolutionTriggerCriterion"/>. </summary>
         public SolutionTriggerCriterion()
@@ -53,16 +24,17 @@ public SolutionTriggerCriterion()
         /// <summary> Initializes a new instance of <see cref="SolutionTriggerCriterion"/>. </summary>
         /// <param name="name"> Trigger criterion name. </param>
         /// <param name="value"> Trigger criterion value. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal SolutionTriggerCriterion(SelfHelpName? name, string value, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        /// <param name="additionalBinaryDataProperties"> Keeps track of any properties unknown to the library. </param>
+        internal SolutionTriggerCriterion(SelfHelpName? name, string value, IDictionary<string, BinaryData> additionalBinaryDataProperties)
         {
             Name = name;
             Value = value;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
+            _additionalBinaryDataProperties = additionalBinaryDataProperties;
         }
 
         /// <summary> Trigger criterion name. </summary>
         public SelfHelpName? Name { get; set; }
+
         /// <summary> Trigger criterion value. </summary>
         public string Value { get; set; }
     }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionWarmUpContent.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionWarmUpContent.Serialization.cs
index 081b3db5b605..21b7174f4de2 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionWarmUpContent.Serialization.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionWarmUpContent.Serialization.cs
@@ -10,13 +10,15 @@
 using System.Collections.Generic;
 using System.Text.Json;
 using Azure.Core;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
-    public partial class SolutionWarmUpContent : IUtf8JsonSerializable, IJsonModel<SolutionWarmUpContent>
+    /// <summary> Solution WarmUpRequest body. </summary>
+    public partial class SolutionWarmUpContent : IJsonModel<SolutionWarmUpContent>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<SolutionWarmUpContent>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
+        /// <param name="writer"> The JSON writer. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
         void IJsonModel<SolutionWarmUpContent>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
@@ -28,12 +30,11 @@ void IJsonModel<SolutionWarmUpContent>.Write(Utf8JsonWriter writer, ModelReaderW
         /// <param name="options"> The client options for reading and writing models. </param>
         protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<SolutionWarmUpContent>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<SolutionWarmUpContent>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(SolutionWarmUpContent)} does not support writing '{format}' format.");
             }
-
             if (Optional.IsCollectionDefined(Parameters))
             {
                 writer.WritePropertyName("parameters"u8);
@@ -41,19 +42,24 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
                 foreach (var item in Parameters)
                 {
                     writer.WritePropertyName(item.Key);
+                    if (item.Value == null)
+                    {
+                        writer.WriteNullValue();
+                        continue;
+                    }
                     writer.WriteStringValue(item.Value);
                 }
                 writer.WriteEndObject();
             }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            if (options.Format != "W" && _additionalBinaryDataProperties != null)
             {
-                foreach (var item in _serializedAdditionalRawData)
+                foreach (var item in _additionalBinaryDataProperties)
                 {
                     writer.WritePropertyName(item.Key);
 #if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
+                    writer.WriteRawValue(item.Value);
 #else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value, ModelSerializationExtensions.JsonDocumentOptions))
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
                     {
                         JsonSerializer.Serialize(writer, document.RootElement);
                     }
@@ -62,58 +68,71 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             }
         }
 
-        SolutionWarmUpContent IJsonModel<SolutionWarmUpContent>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        SolutionWarmUpContent IJsonModel<SolutionWarmUpContent>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options);
+
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual SolutionWarmUpContent JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<SolutionWarmUpContent>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<SolutionWarmUpContent>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(SolutionWarmUpContent)} does not support reading '{format}' format.");
             }
-
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
             return DeserializeSolutionWarmUpContent(document.RootElement, options);
         }
 
-        internal static SolutionWarmUpContent DeserializeSolutionWarmUpContent(JsonElement element, ModelReaderWriterOptions options = null)
+        /// <param name="element"> The JSON element to deserialize. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        internal static SolutionWarmUpContent DeserializeSolutionWarmUpContent(JsonElement element, ModelReaderWriterOptions options)
         {
-            options ??= ModelSerializationExtensions.WireOptions;
-
             if (element.ValueKind == JsonValueKind.Null)
             {
                 return null;
             }
             IDictionary<string, string> parameters = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
+            IDictionary<string, BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            foreach (var prop in element.EnumerateObject())
             {
-                if (property.NameEquals("parameters"u8))
+                if (prop.NameEquals("parameters"u8))
                 {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
                     Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                    foreach (var property0 in property.Value.EnumerateObject())
+                    foreach (var prop0 in prop.Value.EnumerateObject())
                     {
-                        dictionary.Add(property0.Name, property0.Value.GetString());
+                        if (prop0.Value.ValueKind == JsonValueKind.Null)
+                        {
+                            dictionary.Add(prop0.Name, null);
+                        }
+                        else
+                        {
+                            dictionary.Add(prop0.Name, prop0.Value.GetString());
+                        }
                     }
                     parameters = dictionary;
                     continue;
                 }
                 if (options.Format != "W")
                 {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                    additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText()));
                 }
             }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new SolutionWarmUpContent(parameters ?? new ChangeTrackingDictionary<string, string>(), serializedAdditionalRawData);
+            return new SolutionWarmUpContent(parameters ?? new ChangeTrackingDictionary<string, string>(), additionalBinaryDataProperties);
         }
 
-        BinaryData IPersistableModel<SolutionWarmUpContent>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SolutionWarmUpContent>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="options"> The client options for reading and writing models. </param>
+        BinaryData IPersistableModel<SolutionWarmUpContent>.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
 
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SolutionWarmUpContent>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
@@ -123,15 +142,20 @@ BinaryData IPersistableModel<SolutionWarmUpContent>.Write(ModelReaderWriterOptio
             }
         }
 
-        SolutionWarmUpContent IPersistableModel<SolutionWarmUpContent>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SolutionWarmUpContent>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        SolutionWarmUpContent IPersistableModel<SolutionWarmUpContent>.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options);
 
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual SolutionWarmUpContent PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SolutionWarmUpContent>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
+                    using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
                     {
-                        using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
                         return DeserializeSolutionWarmUpContent(document.RootElement, options);
                     }
                 default:
@@ -139,6 +163,19 @@ SolutionWarmUpContent IPersistableModel<SolutionWarmUpContent>.Create(BinaryData
             }
         }
 
+        /// <param name="options"> The client options for reading and writing models. </param>
         string IPersistableModel<SolutionWarmUpContent>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <param name="solutionWarmUpContent"> The <see cref="SolutionWarmUpContent"/> to serialize into <see cref="RequestContent"/>. </param>
+        internal static RequestContent ToRequestContent(SolutionWarmUpContent solutionWarmUpContent)
+        {
+            if (solutionWarmUpContent == null)
+            {
+                return null;
+            }
+            Utf8JsonRequestContent content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(solutionWarmUpContent, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionWarmUpContent.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionWarmUpContent.cs
index 4aaf32f06dcc..7b7233cc62fe 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionWarmUpContent.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionWarmUpContent.cs
@@ -7,43 +7,15 @@
 
 using System;
 using System.Collections.Generic;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
     /// <summary> Solution WarmUpRequest body. </summary>
     public partial class SolutionWarmUpContent
     {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+        /// <summary> Keeps track of any properties unknown to the library. </summary>
+        private protected readonly IDictionary<string, BinaryData> _additionalBinaryDataProperties;
 
         /// <summary> Initializes a new instance of <see cref="SolutionWarmUpContent"/>. </summary>
         public SolutionWarmUpContent()
@@ -53,11 +25,11 @@ public SolutionWarmUpContent()
 
         /// <summary> Initializes a new instance of <see cref="SolutionWarmUpContent"/>. </summary>
         /// <param name="parameters"> Dictionary of &lt;string&gt;. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal SolutionWarmUpContent(IDictionary<string, string> parameters, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        /// <param name="additionalBinaryDataProperties"> Keeps track of any properties unknown to the library. </param>
+        internal SolutionWarmUpContent(IDictionary<string, string> parameters, IDictionary<string, BinaryData> additionalBinaryDataProperties)
         {
             Parameters = parameters;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
+            _additionalBinaryDataProperties = additionalBinaryDataProperties;
         }
 
         /// <summary> Dictionary of &lt;string&gt;. </summary>
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionsDiagnostic.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionsDiagnostic.Serialization.cs
index 2d11b5439e07..b8bdb340d62f 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionsDiagnostic.Serialization.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionsDiagnostic.Serialization.cs
@@ -9,14 +9,15 @@
 using System.ClientModel.Primitives;
 using System.Collections.Generic;
 using System.Text.Json;
-using Azure.Core;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
-    public partial class SolutionsDiagnostic : IUtf8JsonSerializable, IJsonModel<SolutionsDiagnostic>
+    /// <summary> Solutions Diagnostic. </summary>
+    public partial class SolutionsDiagnostic : IJsonModel<SolutionsDiagnostic>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<SolutionsDiagnostic>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
+        /// <param name="writer"> The JSON writer. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
         void IJsonModel<SolutionsDiagnostic>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
@@ -28,12 +29,11 @@ void IJsonModel<SolutionsDiagnostic>.Write(Utf8JsonWriter writer, ModelReaderWri
         /// <param name="options"> The client options for reading and writing models. </param>
         protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<SolutionsDiagnostic>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<SolutionsDiagnostic>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(SolutionsDiagnostic)} does not support writing '{format}' format.");
             }
-
             if (Optional.IsDefined(SolutionId))
             {
                 writer.WritePropertyName("solutionId"u8);
@@ -63,8 +63,13 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             {
                 writer.WritePropertyName("requiredParameters"u8);
                 writer.WriteStartArray();
-                foreach (var item in RequiredParameters)
+                foreach (string item in RequiredParameters)
                 {
+                    if (item == null)
+                    {
+                        writer.WriteNullValue();
+                        continue;
+                    }
                     writer.WriteStringValue(item);
                 }
                 writer.WriteEndArray();
@@ -73,21 +78,21 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             {
                 writer.WritePropertyName("insights"u8);
                 writer.WriteStartArray();
-                foreach (var item in Insights)
+                foreach (SelfHelpDiagnosticInsight item in Insights)
                 {
                     writer.WriteObjectValue(item, options);
                 }
                 writer.WriteEndArray();
             }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            if (options.Format != "W" && _additionalBinaryDataProperties != null)
             {
-                foreach (var item in _serializedAdditionalRawData)
+                foreach (var item in _additionalBinaryDataProperties)
                 {
                     writer.WritePropertyName(item.Key);
 #if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
+                    writer.WriteRawValue(item.Value);
 #else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value, ModelSerializationExtensions.JsonDocumentOptions))
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
                     {
                         JsonSerializer.Serialize(writer, document.RootElement);
                     }
@@ -96,22 +101,27 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             }
         }
 
-        SolutionsDiagnostic IJsonModel<SolutionsDiagnostic>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        SolutionsDiagnostic IJsonModel<SolutionsDiagnostic>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options);
+
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual SolutionsDiagnostic JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<SolutionsDiagnostic>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<SolutionsDiagnostic>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(SolutionsDiagnostic)} does not support reading '{format}' format.");
             }
-
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
             return DeserializeSolutionsDiagnostic(document.RootElement, options);
         }
 
-        internal static SolutionsDiagnostic DeserializeSolutionsDiagnostic(JsonElement element, ModelReaderWriterOptions options = null)
+        /// <param name="element"> The JSON element to deserialize. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        internal static SolutionsDiagnostic DeserializeSolutionsDiagnostic(JsonElement element, ModelReaderWriterOptions options)
         {
-            options ??= ModelSerializationExtensions.WireOptions;
-
             if (element.ValueKind == JsonValueKind.Null)
             {
                 return null;
@@ -121,63 +131,69 @@ internal static SolutionsDiagnostic DeserializeSolutionsDiagnostic(JsonElement e
             string statusDetails = default;
             string replacementKey = default;
             string estimatedCompletionTime = default;
-            IReadOnlyList<string> requiredParameters = default;
-            IReadOnlyList<SelfHelpDiagnosticInsight> insights = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
+            IList<string> requiredParameters = default;
+            IList<SelfHelpDiagnosticInsight> insights = default;
+            IDictionary<string, BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            foreach (var prop in element.EnumerateObject())
             {
-                if (property.NameEquals("solutionId"u8))
+                if (prop.NameEquals("solutionId"u8))
                 {
-                    solutionId = property.Value.GetString();
+                    solutionId = prop.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("status"u8))
+                if (prop.NameEquals("status"u8))
                 {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
-                    status = new SelfHelpDiagnosticStatus(property.Value.GetString());
+                    status = new SelfHelpDiagnosticStatus(prop.Value.GetString());
                     continue;
                 }
-                if (property.NameEquals("statusDetails"u8))
+                if (prop.NameEquals("statusDetails"u8))
                 {
-                    statusDetails = property.Value.GetString();
+                    statusDetails = prop.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("replacementKey"u8))
+                if (prop.NameEquals("replacementKey"u8))
                 {
-                    replacementKey = property.Value.GetString();
+                    replacementKey = prop.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("estimatedCompletionTime"u8))
+                if (prop.NameEquals("estimatedCompletionTime"u8))
                 {
-                    estimatedCompletionTime = property.Value.GetString();
+                    estimatedCompletionTime = prop.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("requiredParameters"u8))
+                if (prop.NameEquals("requiredParameters"u8))
                 {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
                     List<string> array = new List<string>();
-                    foreach (var item in property.Value.EnumerateArray())
+                    foreach (var item in prop.Value.EnumerateArray())
                     {
-                        array.Add(item.GetString());
+                        if (item.ValueKind == JsonValueKind.Null)
+                        {
+                            array.Add(null);
+                        }
+                        else
+                        {
+                            array.Add(item.GetString());
+                        }
                     }
                     requiredParameters = array;
                     continue;
                 }
-                if (property.NameEquals("insights"u8))
+                if (prop.NameEquals("insights"u8))
                 {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
                     List<SelfHelpDiagnosticInsight> array = new List<SelfHelpDiagnosticInsight>();
-                    foreach (var item in property.Value.EnumerateArray())
+                    foreach (var item in prop.Value.EnumerateArray())
                     {
                         array.Add(SelfHelpDiagnosticInsight.DeserializeSelfHelpDiagnosticInsight(item, options));
                     }
@@ -186,10 +202,9 @@ internal static SolutionsDiagnostic DeserializeSolutionsDiagnostic(JsonElement e
                 }
                 if (options.Format != "W")
                 {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                    additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText()));
                 }
             }
-            serializedAdditionalRawData = rawDataDictionary;
             return new SolutionsDiagnostic(
                 solutionId,
                 status,
@@ -198,13 +213,16 @@ internal static SolutionsDiagnostic DeserializeSolutionsDiagnostic(JsonElement e
                 estimatedCompletionTime,
                 requiredParameters ?? new ChangeTrackingList<string>(),
                 insights ?? new ChangeTrackingList<SelfHelpDiagnosticInsight>(),
-                serializedAdditionalRawData);
+                additionalBinaryDataProperties);
         }
 
-        BinaryData IPersistableModel<SolutionsDiagnostic>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SolutionsDiagnostic>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="options"> The client options for reading and writing models. </param>
+        BinaryData IPersistableModel<SolutionsDiagnostic>.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
 
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SolutionsDiagnostic>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
@@ -214,15 +232,20 @@ BinaryData IPersistableModel<SolutionsDiagnostic>.Write(ModelReaderWriterOptions
             }
         }
 
-        SolutionsDiagnostic IPersistableModel<SolutionsDiagnostic>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SolutionsDiagnostic>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        SolutionsDiagnostic IPersistableModel<SolutionsDiagnostic>.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options);
 
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual SolutionsDiagnostic PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SolutionsDiagnostic>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
+                    using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
                     {
-                        using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
                         return DeserializeSolutionsDiagnostic(document.RootElement, options);
                     }
                 default:
@@ -230,6 +253,7 @@ SolutionsDiagnostic IPersistableModel<SolutionsDiagnostic>.Create(BinaryData dat
             }
         }
 
+        /// <param name="options"> The client options for reading and writing models. </param>
         string IPersistableModel<SolutionsDiagnostic>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionsDiagnostic.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionsDiagnostic.cs
index 42637874c521..462b89be5790 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionsDiagnostic.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionsDiagnostic.cs
@@ -7,43 +7,15 @@
 
 using System;
 using System.Collections.Generic;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
     /// <summary> Solutions Diagnostic. </summary>
     public partial class SolutionsDiagnostic
     {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+        /// <summary> Keeps track of any properties unknown to the library. </summary>
+        private protected readonly IDictionary<string, BinaryData> _additionalBinaryDataProperties;
 
         /// <summary> Initializes a new instance of <see cref="SolutionsDiagnostic"/>. </summary>
         internal SolutionsDiagnostic()
@@ -60,8 +32,8 @@ internal SolutionsDiagnostic()
         /// <param name="estimatedCompletionTime"> Diagnostics estimated completion time in minutes. </param>
         /// <param name="requiredParameters"> Required parameters of this item. </param>
         /// <param name="insights"> Diagnostic insights. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal SolutionsDiagnostic(string solutionId, SelfHelpDiagnosticStatus? status, string statusDetails, string replacementKey, string estimatedCompletionTime, IReadOnlyList<string> requiredParameters, IReadOnlyList<SelfHelpDiagnosticInsight> insights, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        /// <param name="additionalBinaryDataProperties"> Keeps track of any properties unknown to the library. </param>
+        internal SolutionsDiagnostic(string solutionId, SelfHelpDiagnosticStatus? status, string statusDetails, string replacementKey, string estimatedCompletionTime, IList<string> requiredParameters, IList<SelfHelpDiagnosticInsight> insights, IDictionary<string, BinaryData> additionalBinaryDataProperties)
         {
             SolutionId = solutionId;
             Status = status;
@@ -70,22 +42,28 @@ internal SolutionsDiagnostic(string solutionId, SelfHelpDiagnosticStatus? status
             EstimatedCompletionTime = estimatedCompletionTime;
             RequiredParameters = requiredParameters;
             Insights = insights;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
+            _additionalBinaryDataProperties = additionalBinaryDataProperties;
         }
 
         /// <summary> Solution Id to identify single Solutions Diagnostic. </summary>
         public string SolutionId { get; }
+
         /// <summary> Denotes the status of the diagnostic resource. </summary>
         public SelfHelpDiagnosticStatus? Status { get; }
+
         /// <summary> Details of the status. </summary>
         public string StatusDetails { get; }
+
         /// <summary> Place holder used in HTML Content replace control with the content. </summary>
         public string ReplacementKey { get; }
+
         /// <summary> Diagnostics estimated completion time in minutes. </summary>
         public string EstimatedCompletionTime { get; }
+
         /// <summary> Required parameters of this item. </summary>
-        public IReadOnlyList<string> RequiredParameters { get; }
+        public IList<string> RequiredParameters { get; }
+
         /// <summary> Diagnostic insights. </summary>
-        public IReadOnlyList<SelfHelpDiagnosticInsight> Insights { get; }
+        public IList<SelfHelpDiagnosticInsight> Insights { get; }
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionsResourcePropertiesSelfHelp.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionsResourcePropertiesSelfHelp.Serialization.cs
new file mode 100644
index 000000000000..84ab352ccce1
--- /dev/null
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionsResourcePropertiesSelfHelp.Serialization.cs
@@ -0,0 +1,209 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.ResourceManager.SelfHelp;
+
+namespace Azure.ResourceManager.SelfHelp.Models
+{
+    /// <summary> Solution result. </summary>
+    internal partial class SolutionsResourcePropertiesSelfHelp : IJsonModel<SolutionsResourcePropertiesSelfHelp>
+    {
+        /// <param name="writer"> The JSON writer. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        void IJsonModel<SolutionsResourcePropertiesSelfHelp>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            writer.WriteStartObject();
+            JsonModelWriteCore(writer, options);
+            writer.WriteEndObject();
+        }
+
+        /// <param name="writer"> The JSON writer. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SolutionsResourcePropertiesSelfHelp>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(SolutionsResourcePropertiesSelfHelp)} does not support writing '{format}' format.");
+            }
+            if (options.Format != "W" && Optional.IsDefined(SolutionId))
+            {
+                writer.WritePropertyName("solutionId"u8);
+                writer.WriteStringValue(SolutionId);
+            }
+            if (options.Format != "W" && Optional.IsDefined(Title))
+            {
+                writer.WritePropertyName("title"u8);
+                writer.WriteStringValue(Title);
+            }
+            if (options.Format != "W" && Optional.IsDefined(Content))
+            {
+                writer.WritePropertyName("content"u8);
+                writer.WriteStringValue(Content);
+            }
+            if (options.Format != "W" && Optional.IsDefined(ReplacementMaps))
+            {
+                writer.WritePropertyName("replacementMaps"u8);
+                writer.WriteObjectValue(ReplacementMaps, options);
+            }
+            if (options.Format != "W" && Optional.IsCollectionDefined(Sections))
+            {
+                writer.WritePropertyName("sections"u8);
+                writer.WriteStartArray();
+                foreach (SolutionSection item in Sections)
+                {
+                    writer.WriteObjectValue(item, options);
+                }
+                writer.WriteEndArray();
+            }
+            if (options.Format != "W" && _additionalBinaryDataProperties != null)
+            {
+                foreach (var item in _additionalBinaryDataProperties)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+                    writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+        }
+
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        SolutionsResourcePropertiesSelfHelp IJsonModel<SolutionsResourcePropertiesSelfHelp>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options);
+
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual SolutionsResourcePropertiesSelfHelp JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SolutionsResourcePropertiesSelfHelp>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(SolutionsResourcePropertiesSelfHelp)} does not support reading '{format}' format.");
+            }
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeSolutionsResourcePropertiesSelfHelp(document.RootElement, options);
+        }
+
+        /// <param name="element"> The JSON element to deserialize. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        internal static SolutionsResourcePropertiesSelfHelp DeserializeSolutionsResourcePropertiesSelfHelp(JsonElement element, ModelReaderWriterOptions options)
+        {
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string solutionId = default;
+            string title = default;
+            string content = default;
+            ReplacementMapsResult replacementMaps = default;
+            IReadOnlyList<SolutionSection> sections = default;
+            IDictionary<string, BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            foreach (var prop in element.EnumerateObject())
+            {
+                if (prop.NameEquals("solutionId"u8))
+                {
+                    solutionId = prop.Value.GetString();
+                    continue;
+                }
+                if (prop.NameEquals("title"u8))
+                {
+                    title = prop.Value.GetString();
+                    continue;
+                }
+                if (prop.NameEquals("content"u8))
+                {
+                    content = prop.Value.GetString();
+                    continue;
+                }
+                if (prop.NameEquals("replacementMaps"u8))
+                {
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    replacementMaps = ReplacementMapsResult.DeserializeReplacementMapsResult(prop.Value, options);
+                    continue;
+                }
+                if (prop.NameEquals("sections"u8))
+                {
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    List<SolutionSection> array = new List<SolutionSection>();
+                    foreach (var item in prop.Value.EnumerateArray())
+                    {
+                        array.Add(SolutionSection.DeserializeSolutionSection(item, options));
+                    }
+                    sections = array;
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText()));
+                }
+            }
+            return new SolutionsResourcePropertiesSelfHelp(
+                solutionId,
+                title,
+                content,
+                replacementMaps,
+                sections ?? new ChangeTrackingList<SolutionSection>(),
+                additionalBinaryDataProperties);
+        }
+
+        /// <param name="options"> The client options for reading and writing models. </param>
+        BinaryData IPersistableModel<SolutionsResourcePropertiesSelfHelp>.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
+
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SolutionsResourcePropertiesSelfHelp>)this).GetFormatFromOptions(options) : options.Format;
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options, AzureResourceManagerSelfHelpContext.Default);
+                default:
+                    throw new FormatException($"The model {nameof(SolutionsResourcePropertiesSelfHelp)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        SolutionsResourcePropertiesSelfHelp IPersistableModel<SolutionsResourcePropertiesSelfHelp>.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options);
+
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual SolutionsResourcePropertiesSelfHelp PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SolutionsResourcePropertiesSelfHelp>)this).GetFormatFromOptions(options) : options.Format;
+            switch (format)
+            {
+                case "J":
+                    using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
+                    {
+                        return DeserializeSolutionsResourcePropertiesSelfHelp(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(SolutionsResourcePropertiesSelfHelp)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        /// <param name="options"> The client options for reading and writing models. </param>
+        string IPersistableModel<SolutionsResourcePropertiesSelfHelp>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+    }
+}
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionsResourcePropertiesSelfHelp.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionsResourcePropertiesSelfHelp.cs
new file mode 100644
index 000000000000..953be548b566
--- /dev/null
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionsResourcePropertiesSelfHelp.cs
@@ -0,0 +1,58 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+using Azure.ResourceManager.SelfHelp;
+
+namespace Azure.ResourceManager.SelfHelp.Models
+{
+    /// <summary> Solution result. </summary>
+    internal partial class SolutionsResourcePropertiesSelfHelp
+    {
+        /// <summary> Keeps track of any properties unknown to the library. </summary>
+        private protected readonly IDictionary<string, BinaryData> _additionalBinaryDataProperties;
+
+        /// <summary> Initializes a new instance of <see cref="SolutionsResourcePropertiesSelfHelp"/>. </summary>
+        public SolutionsResourcePropertiesSelfHelp()
+        {
+            Sections = new ChangeTrackingList<SolutionSection>();
+        }
+
+        /// <summary> Initializes a new instance of <see cref="SolutionsResourcePropertiesSelfHelp"/>. </summary>
+        /// <param name="solutionId"> SolutionId is a unique id to identify a solution. You can retrieve the solution id using the Discovery api - https://learn.microsoft.com/en-us/rest/api/help/discovery-solution/list?view=rest-help-2023-09-01-preview&amp;tabs=HTTP. </param>
+        /// <param name="title"> The title. </param>
+        /// <param name="content"> The HTML content that needs to be rendered and shown to customer. </param>
+        /// <param name="replacementMaps"> Solution replacement maps. </param>
+        /// <param name="sections"> List of section object. </param>
+        /// <param name="additionalBinaryDataProperties"> Keeps track of any properties unknown to the library. </param>
+        internal SolutionsResourcePropertiesSelfHelp(string solutionId, string title, string content, ReplacementMapsResult replacementMaps, IReadOnlyList<SolutionSection> sections, IDictionary<string, BinaryData> additionalBinaryDataProperties)
+        {
+            SolutionId = solutionId;
+            Title = title;
+            Content = content;
+            ReplacementMaps = replacementMaps;
+            Sections = sections;
+            _additionalBinaryDataProperties = additionalBinaryDataProperties;
+        }
+
+        /// <summary> SolutionId is a unique id to identify a solution. You can retrieve the solution id using the Discovery api - https://learn.microsoft.com/en-us/rest/api/help/discovery-solution/list?view=rest-help-2023-09-01-preview&amp;tabs=HTTP. </summary>
+        public string SolutionId { get; }
+
+        /// <summary> The title. </summary>
+        public string Title { get; }
+
+        /// <summary> The HTML content that needs to be rendered and shown to customer. </summary>
+        public string Content { get; }
+
+        /// <summary> Solution replacement maps. </summary>
+        public ReplacementMapsResult ReplacementMaps { get; }
+
+        /// <summary> List of section object. </summary>
+        public IReadOnlyList<SolutionSection> Sections { get; } = new ChangeTrackingList<SolutionSection>();
+    }
+}
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionsTroubleshooters.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionsTroubleshooters.Serialization.cs
index 0d9a9e7a3c47..0cd84381007a 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionsTroubleshooters.Serialization.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionsTroubleshooters.Serialization.cs
@@ -9,14 +9,15 @@
 using System.ClientModel.Primitives;
 using System.Collections.Generic;
 using System.Text.Json;
-using Azure.Core;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
-    public partial class SolutionsTroubleshooters : IUtf8JsonSerializable, IJsonModel<SolutionsTroubleshooters>
+    /// <summary> Troubleshooters in Solutions. </summary>
+    public partial class SolutionsTroubleshooters : IJsonModel<SolutionsTroubleshooters>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<SolutionsTroubleshooters>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
+        /// <param name="writer"> The JSON writer. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
         void IJsonModel<SolutionsTroubleshooters>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
@@ -28,12 +29,11 @@ void IJsonModel<SolutionsTroubleshooters>.Write(Utf8JsonWriter writer, ModelRead
         /// <param name="options"> The client options for reading and writing models. </param>
         protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<SolutionsTroubleshooters>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<SolutionsTroubleshooters>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(SolutionsTroubleshooters)} does not support writing '{format}' format.");
             }
-
             if (Optional.IsDefined(SolutionId))
             {
                 writer.WritePropertyName("solutionId"u8);
@@ -49,15 +49,15 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
                 writer.WritePropertyName("summary"u8);
                 writer.WriteStringValue(Summary);
             }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            if (options.Format != "W" && _additionalBinaryDataProperties != null)
             {
-                foreach (var item in _serializedAdditionalRawData)
+                foreach (var item in _additionalBinaryDataProperties)
                 {
                     writer.WritePropertyName(item.Key);
 #if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
+                    writer.WriteRawValue(item.Value);
 #else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value, ModelSerializationExtensions.JsonDocumentOptions))
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
                     {
                         JsonSerializer.Serialize(writer, document.RootElement);
                     }
@@ -66,22 +66,27 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             }
         }
 
-        SolutionsTroubleshooters IJsonModel<SolutionsTroubleshooters>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        SolutionsTroubleshooters IJsonModel<SolutionsTroubleshooters>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options);
+
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual SolutionsTroubleshooters JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<SolutionsTroubleshooters>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<SolutionsTroubleshooters>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(SolutionsTroubleshooters)} does not support reading '{format}' format.");
             }
-
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
             return DeserializeSolutionsTroubleshooters(document.RootElement, options);
         }
 
-        internal static SolutionsTroubleshooters DeserializeSolutionsTroubleshooters(JsonElement element, ModelReaderWriterOptions options = null)
+        /// <param name="element"> The JSON element to deserialize. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        internal static SolutionsTroubleshooters DeserializeSolutionsTroubleshooters(JsonElement element, ModelReaderWriterOptions options)
         {
-            options ??= ModelSerializationExtensions.WireOptions;
-
             if (element.ValueKind == JsonValueKind.Null)
             {
                 return null;
@@ -89,38 +94,39 @@ internal static SolutionsTroubleshooters DeserializeSolutionsTroubleshooters(Jso
             string solutionId = default;
             string title = default;
             string summary = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
+            IDictionary<string, BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            foreach (var prop in element.EnumerateObject())
             {
-                if (property.NameEquals("solutionId"u8))
+                if (prop.NameEquals("solutionId"u8))
                 {
-                    solutionId = property.Value.GetString();
+                    solutionId = prop.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("title"u8))
+                if (prop.NameEquals("title"u8))
                 {
-                    title = property.Value.GetString();
+                    title = prop.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("summary"u8))
+                if (prop.NameEquals("summary"u8))
                 {
-                    summary = property.Value.GetString();
+                    summary = prop.Value.GetString();
                     continue;
                 }
                 if (options.Format != "W")
                 {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                    additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText()));
                 }
             }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new SolutionsTroubleshooters(solutionId, title, summary, serializedAdditionalRawData);
+            return new SolutionsTroubleshooters(solutionId, title, summary, additionalBinaryDataProperties);
         }
 
-        BinaryData IPersistableModel<SolutionsTroubleshooters>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SolutionsTroubleshooters>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="options"> The client options for reading and writing models. </param>
+        BinaryData IPersistableModel<SolutionsTroubleshooters>.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
 
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SolutionsTroubleshooters>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
@@ -130,15 +136,20 @@ BinaryData IPersistableModel<SolutionsTroubleshooters>.Write(ModelReaderWriterOp
             }
         }
 
-        SolutionsTroubleshooters IPersistableModel<SolutionsTroubleshooters>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SolutionsTroubleshooters>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        SolutionsTroubleshooters IPersistableModel<SolutionsTroubleshooters>.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options);
 
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual SolutionsTroubleshooters PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SolutionsTroubleshooters>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
+                    using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
                     {
-                        using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
                         return DeserializeSolutionsTroubleshooters(document.RootElement, options);
                     }
                 default:
@@ -146,6 +157,7 @@ SolutionsTroubleshooters IPersistableModel<SolutionsTroubleshooters>.Create(Bina
             }
         }
 
+        /// <param name="options"> The client options for reading and writing models. </param>
         string IPersistableModel<SolutionsTroubleshooters>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionsTroubleshooters.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionsTroubleshooters.cs
index 5f6a9d3fc5e2..4d76bacd713f 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionsTroubleshooters.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/SolutionsTroubleshooters.cs
@@ -13,37 +13,8 @@ namespace Azure.ResourceManager.SelfHelp.Models
     /// <summary> Troubleshooters in Solutions. </summary>
     public partial class SolutionsTroubleshooters
     {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+        /// <summary> Keeps track of any properties unknown to the library. </summary>
+        private protected readonly IDictionary<string, BinaryData> _additionalBinaryDataProperties;
 
         /// <summary> Initializes a new instance of <see cref="SolutionsTroubleshooters"/>. </summary>
         internal SolutionsTroubleshooters()
@@ -54,19 +25,21 @@ internal SolutionsTroubleshooters()
         /// <param name="solutionId"> Solution Id to identify single Solutions Troubleshooter. </param>
         /// <param name="title"> Troubleshooter title. </param>
         /// <param name="summary"> Troubleshooter summary. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal SolutionsTroubleshooters(string solutionId, string title, string summary, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        /// <param name="additionalBinaryDataProperties"> Keeps track of any properties unknown to the library. </param>
+        internal SolutionsTroubleshooters(string solutionId, string title, string summary, IDictionary<string, BinaryData> additionalBinaryDataProperties)
         {
             SolutionId = solutionId;
             Title = title;
             Summary = summary;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
+            _additionalBinaryDataProperties = additionalBinaryDataProperties;
         }
 
         /// <summary> Solution Id to identify single Solutions Troubleshooter. </summary>
         public string SolutionId { get; }
+
         /// <summary> Troubleshooter title. </summary>
         public string Title { get; }
+
         /// <summary> Troubleshooter summary. </summary>
         public string Summary { get; }
     }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/TroubleshooterContinueContent.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/TroubleshooterContinueContent.Serialization.cs
index b2f1e15c3085..f347298ee4c6 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/TroubleshooterContinueContent.Serialization.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/TroubleshooterContinueContent.Serialization.cs
@@ -10,13 +10,15 @@
 using System.Collections.Generic;
 using System.Text.Json;
 using Azure.Core;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
-    public partial class TroubleshooterContinueContent : IUtf8JsonSerializable, IJsonModel<TroubleshooterContinueContent>
+    /// <summary> Troubleshooter ContinueRequest body. </summary>
+    public partial class TroubleshooterContinueContent : IJsonModel<TroubleshooterContinueContent>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<TroubleshooterContinueContent>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
+        /// <param name="writer"> The JSON writer. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
         void IJsonModel<TroubleshooterContinueContent>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
@@ -28,12 +30,11 @@ void IJsonModel<TroubleshooterContinueContent>.Write(Utf8JsonWriter writer, Mode
         /// <param name="options"> The client options for reading and writing models. </param>
         protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<TroubleshooterContinueContent>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<TroubleshooterContinueContent>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(TroubleshooterContinueContent)} does not support writing '{format}' format.");
             }
-
             if (Optional.IsDefined(StepId))
             {
                 writer.WritePropertyName("stepId"u8);
@@ -43,21 +44,21 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             {
                 writer.WritePropertyName("responses"u8);
                 writer.WriteStartArray();
-                foreach (var item in Responses)
+                foreach (TroubleshooterResult item in Responses)
                 {
                     writer.WriteObjectValue(item, options);
                 }
                 writer.WriteEndArray();
             }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            if (options.Format != "W" && _additionalBinaryDataProperties != null)
             {
-                foreach (var item in _serializedAdditionalRawData)
+                foreach (var item in _additionalBinaryDataProperties)
                 {
                     writer.WritePropertyName(item.Key);
 #if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
+                    writer.WriteRawValue(item.Value);
 #else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value, ModelSerializationExtensions.JsonDocumentOptions))
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
                     {
                         JsonSerializer.Serialize(writer, document.RootElement);
                     }
@@ -66,45 +67,49 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             }
         }
 
-        TroubleshooterContinueContent IJsonModel<TroubleshooterContinueContent>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        TroubleshooterContinueContent IJsonModel<TroubleshooterContinueContent>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options);
+
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual TroubleshooterContinueContent JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<TroubleshooterContinueContent>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<TroubleshooterContinueContent>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(TroubleshooterContinueContent)} does not support reading '{format}' format.");
             }
-
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
             return DeserializeTroubleshooterContinueContent(document.RootElement, options);
         }
 
-        internal static TroubleshooterContinueContent DeserializeTroubleshooterContinueContent(JsonElement element, ModelReaderWriterOptions options = null)
+        /// <param name="element"> The JSON element to deserialize. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        internal static TroubleshooterContinueContent DeserializeTroubleshooterContinueContent(JsonElement element, ModelReaderWriterOptions options)
         {
-            options ??= ModelSerializationExtensions.WireOptions;
-
             if (element.ValueKind == JsonValueKind.Null)
             {
                 return null;
             }
             string stepId = default;
             IList<TroubleshooterResult> responses = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
+            IDictionary<string, BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            foreach (var prop in element.EnumerateObject())
             {
-                if (property.NameEquals("stepId"u8))
+                if (prop.NameEquals("stepId"u8))
                 {
-                    stepId = property.Value.GetString();
+                    stepId = prop.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("responses"u8))
+                if (prop.NameEquals("responses"u8))
                 {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
                     List<TroubleshooterResult> array = new List<TroubleshooterResult>();
-                    foreach (var item in property.Value.EnumerateArray())
+                    foreach (var item in prop.Value.EnumerateArray())
                     {
                         array.Add(TroubleshooterResult.DeserializeTroubleshooterResult(item, options));
                     }
@@ -113,17 +118,19 @@ internal static TroubleshooterContinueContent DeserializeTroubleshooterContinueC
                 }
                 if (options.Format != "W")
                 {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                    additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText()));
                 }
             }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new TroubleshooterContinueContent(stepId, responses ?? new ChangeTrackingList<TroubleshooterResult>(), serializedAdditionalRawData);
+            return new TroubleshooterContinueContent(stepId, responses ?? new ChangeTrackingList<TroubleshooterResult>(), additionalBinaryDataProperties);
         }
 
-        BinaryData IPersistableModel<TroubleshooterContinueContent>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<TroubleshooterContinueContent>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="options"> The client options for reading and writing models. </param>
+        BinaryData IPersistableModel<TroubleshooterContinueContent>.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
 
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<TroubleshooterContinueContent>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
@@ -133,15 +140,20 @@ BinaryData IPersistableModel<TroubleshooterContinueContent>.Write(ModelReaderWri
             }
         }
 
-        TroubleshooterContinueContent IPersistableModel<TroubleshooterContinueContent>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<TroubleshooterContinueContent>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        TroubleshooterContinueContent IPersistableModel<TroubleshooterContinueContent>.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options);
 
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual TroubleshooterContinueContent PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<TroubleshooterContinueContent>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
+                    using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
                     {
-                        using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
                         return DeserializeTroubleshooterContinueContent(document.RootElement, options);
                     }
                 default:
@@ -149,6 +161,19 @@ TroubleshooterContinueContent IPersistableModel<TroubleshooterContinueContent>.C
             }
         }
 
+        /// <param name="options"> The client options for reading and writing models. </param>
         string IPersistableModel<TroubleshooterContinueContent>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <param name="troubleshooterContinueContent"> The <see cref="TroubleshooterContinueContent"/> to serialize into <see cref="RequestContent"/>. </param>
+        internal static RequestContent ToRequestContent(TroubleshooterContinueContent troubleshooterContinueContent)
+        {
+            if (troubleshooterContinueContent == null)
+            {
+                return null;
+            }
+            Utf8JsonRequestContent content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(troubleshooterContinueContent, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/TroubleshooterContinueContent.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/TroubleshooterContinueContent.cs
index 0d34451a4f2a..94ea02f4940e 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/TroubleshooterContinueContent.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/TroubleshooterContinueContent.cs
@@ -7,43 +7,15 @@
 
 using System;
 using System.Collections.Generic;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
     /// <summary> Troubleshooter ContinueRequest body. </summary>
     public partial class TroubleshooterContinueContent
     {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+        /// <summary> Keeps track of any properties unknown to the library. </summary>
+        private protected readonly IDictionary<string, BinaryData> _additionalBinaryDataProperties;
 
         /// <summary> Initializes a new instance of <see cref="TroubleshooterContinueContent"/>. </summary>
         public TroubleshooterContinueContent()
@@ -54,17 +26,18 @@ public TroubleshooterContinueContent()
         /// <summary> Initializes a new instance of <see cref="TroubleshooterContinueContent"/>. </summary>
         /// <param name="stepId"> Unique id of the result. </param>
         /// <param name="responses"></param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal TroubleshooterContinueContent(string stepId, IList<TroubleshooterResult> responses, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        /// <param name="additionalBinaryDataProperties"> Keeps track of any properties unknown to the library. </param>
+        internal TroubleshooterContinueContent(string stepId, IList<TroubleshooterResult> responses, IDictionary<string, BinaryData> additionalBinaryDataProperties)
         {
             StepId = stepId;
             Responses = responses;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
+            _additionalBinaryDataProperties = additionalBinaryDataProperties;
         }
 
         /// <summary> Unique id of the result. </summary>
         public string StepId { get; set; }
-        /// <summary> Gets the responses. </summary>
+
+        /// <summary> Gets the Responses. </summary>
         public IList<TroubleshooterResult> Responses { get; }
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/TroubleshooterExecutionStatus.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/TroubleshooterExecutionStatus.cs
index a8c0fa380786..7531e59f4d1c 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/TroubleshooterExecutionStatus.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/TroubleshooterExecutionStatus.cs
@@ -7,6 +7,7 @@
 
 using System;
 using System.ComponentModel;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
@@ -14,44 +15,67 @@ namespace Azure.ResourceManager.SelfHelp.Models
     public readonly partial struct TroubleshooterExecutionStatus : IEquatable<TroubleshooterExecutionStatus>
     {
         private readonly string _value;
+        /// <summary> Step execution succeeded. </summary>
+        private const string SuccessValue = "Success";
+        /// <summary> Step execution running. </summary>
+        private const string RunningValue = "Running";
+        /// <summary> Step execution failed. </summary>
+        private const string FailedValue = "Failed";
+        /// <summary> Step execution warning. </summary>
+        private const string WarningValue = "Warning";
 
         /// <summary> Initializes a new instance of <see cref="TroubleshooterExecutionStatus"/>. </summary>
+        /// <param name="value"> The value. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
         public TroubleshooterExecutionStatus(string value)
         {
-            _value = value ?? throw new ArgumentNullException(nameof(value));
-        }
+            Argument.AssertNotNull(value, nameof(value));
 
-        private const string SuccessValue = "Success";
-        private const string RunningValue = "Running";
-        private const string FailedValue = "Failed";
-        private const string WarningValue = "Warning";
+            _value = value;
+        }
 
         /// <summary> Step execution succeeded. </summary>
         public static TroubleshooterExecutionStatus Success { get; } = new TroubleshooterExecutionStatus(SuccessValue);
+
         /// <summary> Step execution running. </summary>
         public static TroubleshooterExecutionStatus Running { get; } = new TroubleshooterExecutionStatus(RunningValue);
+
         /// <summary> Step execution failed. </summary>
         public static TroubleshooterExecutionStatus Failed { get; } = new TroubleshooterExecutionStatus(FailedValue);
+
         /// <summary> Step execution warning. </summary>
         public static TroubleshooterExecutionStatus Warning { get; } = new TroubleshooterExecutionStatus(WarningValue);
+
         /// <summary> Determines if two <see cref="TroubleshooterExecutionStatus"/> values are the same. </summary>
+        /// <param name="left"> The left value to compare. </param>
+        /// <param name="right"> The right value to compare. </param>
         public static bool operator ==(TroubleshooterExecutionStatus left, TroubleshooterExecutionStatus right) => left.Equals(right);
+
         /// <summary> Determines if two <see cref="TroubleshooterExecutionStatus"/> values are not the same. </summary>
+        /// <param name="left"> The left value to compare. </param>
+        /// <param name="right"> The right value to compare. </param>
         public static bool operator !=(TroubleshooterExecutionStatus left, TroubleshooterExecutionStatus right) => !left.Equals(right);
-        /// <summary> Converts a <see cref="string"/> to a <see cref="TroubleshooterExecutionStatus"/>. </summary>
+
+        /// <summary> Converts a string to a <see cref="TroubleshooterExecutionStatus"/>. </summary>
+        /// <param name="value"> The value. </param>
         public static implicit operator TroubleshooterExecutionStatus(string value) => new TroubleshooterExecutionStatus(value);
 
-        /// <inheritdoc />
+        /// <summary> Converts a string to a <see cref="TroubleshooterExecutionStatus"/>. </summary>
+        /// <param name="value"> The value. </param>
+        public static implicit operator TroubleshooterExecutionStatus?(string value) => value == null ? null : new TroubleshooterExecutionStatus(value);
+
+        /// <inheritdoc/>
         [EditorBrowsable(EditorBrowsableState.Never)]
         public override bool Equals(object obj) => obj is TroubleshooterExecutionStatus other && Equals(other);
-        /// <inheritdoc />
+
+        /// <inheritdoc/>
         public bool Equals(TroubleshooterExecutionStatus other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
 
-        /// <inheritdoc />
+        /// <inheritdoc/>
         [EditorBrowsable(EditorBrowsableState.Never)]
         public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
-        /// <inheritdoc />
+
+        /// <inheritdoc/>
         public override string ToString() => _value;
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/TroubleshooterInstanceProperties.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/TroubleshooterInstanceProperties.Serialization.cs
new file mode 100644
index 000000000000..3c69658f51bc
--- /dev/null
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/TroubleshooterInstanceProperties.Serialization.cs
@@ -0,0 +1,219 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text.Json;
+using Azure.ResourceManager.SelfHelp;
+
+namespace Azure.ResourceManager.SelfHelp.Models
+{
+    /// <summary> Troubleshooter Instance properties. </summary>
+    internal partial class TroubleshooterInstanceProperties : IJsonModel<TroubleshooterInstanceProperties>
+    {
+        /// <param name="writer"> The JSON writer. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        void IJsonModel<TroubleshooterInstanceProperties>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            writer.WriteStartObject();
+            JsonModelWriteCore(writer, options);
+            writer.WriteEndObject();
+        }
+
+        /// <param name="writer"> The JSON writer. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<TroubleshooterInstanceProperties>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(TroubleshooterInstanceProperties)} does not support writing '{format}' format.");
+            }
+            if (Optional.IsDefined(SolutionId))
+            {
+                writer.WritePropertyName("solutionId"u8);
+                writer.WriteStringValue(SolutionId);
+            }
+            if (Optional.IsCollectionDefined(Parameters))
+            {
+                writer.WritePropertyName("parameters"u8);
+                writer.WriteStartObject();
+                foreach (var item in Parameters)
+                {
+                    writer.WritePropertyName(item.Key);
+                    if (item.Value == null)
+                    {
+                        writer.WriteNullValue();
+                        continue;
+                    }
+                    writer.WriteStringValue(item.Value);
+                }
+                writer.WriteEndObject();
+            }
+            if (options.Format != "W" && Optional.IsDefined(ProvisioningState))
+            {
+                writer.WritePropertyName("provisioningState"u8);
+                writer.WriteStringValue(ProvisioningState.Value.ToString());
+            }
+            if (options.Format != "W" && Optional.IsCollectionDefined(Steps))
+            {
+                writer.WritePropertyName("steps"u8);
+                writer.WriteStartArray();
+                foreach (SelfHelpStep item in Steps)
+                {
+                    writer.WriteObjectValue(item, options);
+                }
+                writer.WriteEndArray();
+            }
+            if (options.Format != "W" && _additionalBinaryDataProperties != null)
+            {
+                foreach (var item in _additionalBinaryDataProperties)
+                {
+                    writer.WritePropertyName(item.Key);
+#if NET6_0_OR_GREATER
+                    writer.WriteRawValue(item.Value);
+#else
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    {
+                        JsonSerializer.Serialize(writer, document.RootElement);
+                    }
+#endif
+                }
+            }
+        }
+
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        TroubleshooterInstanceProperties IJsonModel<TroubleshooterInstanceProperties>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options);
+
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual TroubleshooterInstanceProperties JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<TroubleshooterInstanceProperties>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(TroubleshooterInstanceProperties)} does not support reading '{format}' format.");
+            }
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeTroubleshooterInstanceProperties(document.RootElement, options);
+        }
+
+        /// <param name="element"> The JSON element to deserialize. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        internal static TroubleshooterInstanceProperties DeserializeTroubleshooterInstanceProperties(JsonElement element, ModelReaderWriterOptions options)
+        {
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            string solutionId = default;
+            IDictionary<string, string> parameters = default;
+            TroubleshooterProvisioningState? provisioningState = default;
+            IReadOnlyList<SelfHelpStep> steps = default;
+            IDictionary<string, BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            foreach (var prop in element.EnumerateObject())
+            {
+                if (prop.NameEquals("solutionId"u8))
+                {
+                    solutionId = prop.Value.GetString();
+                    continue;
+                }
+                if (prop.NameEquals("parameters"u8))
+                {
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    Dictionary<string, string> dictionary = new Dictionary<string, string>();
+                    foreach (var prop0 in prop.Value.EnumerateObject())
+                    {
+                        if (prop0.Value.ValueKind == JsonValueKind.Null)
+                        {
+                            dictionary.Add(prop0.Name, null);
+                        }
+                        else
+                        {
+                            dictionary.Add(prop0.Name, prop0.Value.GetString());
+                        }
+                    }
+                    parameters = dictionary;
+                    continue;
+                }
+                if (prop.NameEquals("provisioningState"u8))
+                {
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    provisioningState = new TroubleshooterProvisioningState(prop.Value.GetString());
+                    continue;
+                }
+                if (prop.NameEquals("steps"u8))
+                {
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    List<SelfHelpStep> array = new List<SelfHelpStep>();
+                    foreach (var item in prop.Value.EnumerateArray())
+                    {
+                        array.Add(SelfHelpStep.DeserializeSelfHelpStep(item, options));
+                    }
+                    steps = array;
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText()));
+                }
+            }
+            return new TroubleshooterInstanceProperties(solutionId, parameters ?? new ChangeTrackingDictionary<string, string>(), provisioningState, steps ?? new ChangeTrackingList<SelfHelpStep>(), additionalBinaryDataProperties);
+        }
+
+        /// <param name="options"> The client options for reading and writing models. </param>
+        BinaryData IPersistableModel<TroubleshooterInstanceProperties>.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
+
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<TroubleshooterInstanceProperties>)this).GetFormatFromOptions(options) : options.Format;
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options, AzureResourceManagerSelfHelpContext.Default);
+                default:
+                    throw new FormatException($"The model {nameof(TroubleshooterInstanceProperties)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        TroubleshooterInstanceProperties IPersistableModel<TroubleshooterInstanceProperties>.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options);
+
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual TroubleshooterInstanceProperties PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<TroubleshooterInstanceProperties>)this).GetFormatFromOptions(options) : options.Format;
+            switch (format)
+            {
+                case "J":
+                    using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
+                    {
+                        return DeserializeTroubleshooterInstanceProperties(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(TroubleshooterInstanceProperties)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        /// <param name="options"> The client options for reading and writing models. </param>
+        string IPersistableModel<TroubleshooterInstanceProperties>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+    }
+}
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/TroubleshooterInstanceProperties.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/TroubleshooterInstanceProperties.cs
new file mode 100644
index 000000000000..724551600cc3
--- /dev/null
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/TroubleshooterInstanceProperties.cs
@@ -0,0 +1,54 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+using Azure.ResourceManager.SelfHelp;
+
+namespace Azure.ResourceManager.SelfHelp.Models
+{
+    /// <summary> Troubleshooter Instance properties. </summary>
+    internal partial class TroubleshooterInstanceProperties
+    {
+        /// <summary> Keeps track of any properties unknown to the library. </summary>
+        private protected readonly IDictionary<string, BinaryData> _additionalBinaryDataProperties;
+
+        /// <summary> Initializes a new instance of <see cref="TroubleshooterInstanceProperties"/>. </summary>
+        public TroubleshooterInstanceProperties()
+        {
+            Parameters = new ChangeTrackingDictionary<string, string>();
+            Steps = new ChangeTrackingList<SelfHelpStep>();
+        }
+
+        /// <summary> Initializes a new instance of <see cref="TroubleshooterInstanceProperties"/>. </summary>
+        /// <param name="solutionId"> Solution Id to identify single troubleshooter. </param>
+        /// <param name="parameters"> Client input parameters to run Troubleshooter Resource. </param>
+        /// <param name="provisioningState"> Status of troubleshooter provisioning. </param>
+        /// <param name="steps"> List of step object. </param>
+        /// <param name="additionalBinaryDataProperties"> Keeps track of any properties unknown to the library. </param>
+        internal TroubleshooterInstanceProperties(string solutionId, IDictionary<string, string> parameters, TroubleshooterProvisioningState? provisioningState, IReadOnlyList<SelfHelpStep> steps, IDictionary<string, BinaryData> additionalBinaryDataProperties)
+        {
+            SolutionId = solutionId;
+            Parameters = parameters;
+            ProvisioningState = provisioningState;
+            Steps = steps;
+            _additionalBinaryDataProperties = additionalBinaryDataProperties;
+        }
+
+        /// <summary> Solution Id to identify single troubleshooter. </summary>
+        public string SolutionId { get; set; }
+
+        /// <summary> Client input parameters to run Troubleshooter Resource. </summary>
+        public IDictionary<string, string> Parameters { get; } = new ChangeTrackingDictionary<string, string>();
+
+        /// <summary> Status of troubleshooter provisioning. </summary>
+        public TroubleshooterProvisioningState? ProvisioningState { get; }
+
+        /// <summary> List of step object. </summary>
+        public IReadOnlyList<SelfHelpStep> Steps { get; } = new ChangeTrackingList<SelfHelpStep>();
+    }
+}
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/TroubleshooterProvisioningState.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/TroubleshooterProvisioningState.cs
index 38807398f43c..8e184b893ee2 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/TroubleshooterProvisioningState.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/TroubleshooterProvisioningState.cs
@@ -7,6 +7,7 @@
 
 using System;
 using System.ComponentModel;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
@@ -14,47 +15,67 @@ namespace Azure.ResourceManager.SelfHelp.Models
     public readonly partial struct TroubleshooterProvisioningState : IEquatable<TroubleshooterProvisioningState>
     {
         private readonly string _value;
+        private const string SucceededValue = "Succeeded";
+        private const string FailedValue = "Failed";
+        private const string CanceledValue = "Canceled";
+        private const string RunningValue = "Running";
+        private const string AutoContinueValue = "AutoContinue";
 
         /// <summary> Initializes a new instance of <see cref="TroubleshooterProvisioningState"/>. </summary>
+        /// <param name="value"> The value. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
         public TroubleshooterProvisioningState(string value)
         {
-            _value = value ?? throw new ArgumentNullException(nameof(value));
-        }
+            Argument.AssertNotNull(value, nameof(value));
 
-        private const string SucceededValue = "Succeeded";
-        private const string FailedValue = "Failed";
-        private const string CanceledValue = "Canceled";
-        private const string RunningValue = "Running";
-        private const string AutoContinueValue = "AutoContinue";
+            _value = value;
+        }
 
-        /// <summary> Succeeded. </summary>
+        /// <summary> Gets the Succeeded. </summary>
         public static TroubleshooterProvisioningState Succeeded { get; } = new TroubleshooterProvisioningState(SucceededValue);
-        /// <summary> Failed. </summary>
+
+        /// <summary> Gets the Failed. </summary>
         public static TroubleshooterProvisioningState Failed { get; } = new TroubleshooterProvisioningState(FailedValue);
-        /// <summary> Canceled. </summary>
+
+        /// <summary> Gets the Canceled. </summary>
         public static TroubleshooterProvisioningState Canceled { get; } = new TroubleshooterProvisioningState(CanceledValue);
-        /// <summary> Running. </summary>
+
+        /// <summary> Gets the Running. </summary>
         public static TroubleshooterProvisioningState Running { get; } = new TroubleshooterProvisioningState(RunningValue);
-        /// <summary> AutoContinue. </summary>
+
+        /// <summary> Gets the AutoContinue. </summary>
         public static TroubleshooterProvisioningState AutoContinue { get; } = new TroubleshooterProvisioningState(AutoContinueValue);
+
         /// <summary> Determines if two <see cref="TroubleshooterProvisioningState"/> values are the same. </summary>
+        /// <param name="left"> The left value to compare. </param>
+        /// <param name="right"> The right value to compare. </param>
         public static bool operator ==(TroubleshooterProvisioningState left, TroubleshooterProvisioningState right) => left.Equals(right);
+
         /// <summary> Determines if two <see cref="TroubleshooterProvisioningState"/> values are not the same. </summary>
+        /// <param name="left"> The left value to compare. </param>
+        /// <param name="right"> The right value to compare. </param>
         public static bool operator !=(TroubleshooterProvisioningState left, TroubleshooterProvisioningState right) => !left.Equals(right);
-        /// <summary> Converts a <see cref="string"/> to a <see cref="TroubleshooterProvisioningState"/>. </summary>
+
+        /// <summary> Converts a string to a <see cref="TroubleshooterProvisioningState"/>. </summary>
+        /// <param name="value"> The value. </param>
         public static implicit operator TroubleshooterProvisioningState(string value) => new TroubleshooterProvisioningState(value);
 
-        /// <inheritdoc />
+        /// <summary> Converts a string to a <see cref="TroubleshooterProvisioningState"/>. </summary>
+        /// <param name="value"> The value. </param>
+        public static implicit operator TroubleshooterProvisioningState?(string value) => value == null ? null : new TroubleshooterProvisioningState(value);
+
+        /// <inheritdoc/>
         [EditorBrowsable(EditorBrowsableState.Never)]
         public override bool Equals(object obj) => obj is TroubleshooterProvisioningState other && Equals(other);
-        /// <inheritdoc />
+
+        /// <inheritdoc/>
         public bool Equals(TroubleshooterProvisioningState other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
 
-        /// <inheritdoc />
+        /// <inheritdoc/>
         [EditorBrowsable(EditorBrowsableState.Never)]
         public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
-        /// <inheritdoc />
+
+        /// <inheritdoc/>
         public override string ToString() => _value;
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/TroubleshooterQuestionContentType.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/TroubleshooterQuestionContentType.cs
index 218bd981d8f4..ff79e5031ffc 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/TroubleshooterQuestionContentType.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/TroubleshooterQuestionContentType.cs
@@ -7,6 +7,7 @@
 
 using System;
 using System.ComponentModel;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
@@ -14,41 +15,59 @@ namespace Azure.ResourceManager.SelfHelp.Models
     public readonly partial struct TroubleshooterQuestionContentType : IEquatable<TroubleshooterQuestionContentType>
     {
         private readonly string _value;
+        private const string TextValue = "Text";
+        private const string HtmlValue = "Html";
+        private const string MarkdownValue = "Markdown";
 
         /// <summary> Initializes a new instance of <see cref="TroubleshooterQuestionContentType"/>. </summary>
+        /// <param name="value"> The value. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
         public TroubleshooterQuestionContentType(string value)
         {
-            _value = value ?? throw new ArgumentNullException(nameof(value));
-        }
+            Argument.AssertNotNull(value, nameof(value));
 
-        private const string TextValue = "Text";
-        private const string HtmlValue = "Html";
-        private const string MarkdownValue = "Markdown";
+            _value = value;
+        }
 
-        /// <summary> Text. </summary>
+        /// <summary> Gets the Text. </summary>
         public static TroubleshooterQuestionContentType Text { get; } = new TroubleshooterQuestionContentType(TextValue);
-        /// <summary> Html. </summary>
+
+        /// <summary> Gets the Html. </summary>
         public static TroubleshooterQuestionContentType Html { get; } = new TroubleshooterQuestionContentType(HtmlValue);
-        /// <summary> Markdown. </summary>
+
+        /// <summary> Gets the Markdown. </summary>
         public static TroubleshooterQuestionContentType Markdown { get; } = new TroubleshooterQuestionContentType(MarkdownValue);
+
         /// <summary> Determines if two <see cref="TroubleshooterQuestionContentType"/> values are the same. </summary>
+        /// <param name="left"> The left value to compare. </param>
+        /// <param name="right"> The right value to compare. </param>
         public static bool operator ==(TroubleshooterQuestionContentType left, TroubleshooterQuestionContentType right) => left.Equals(right);
+
         /// <summary> Determines if two <see cref="TroubleshooterQuestionContentType"/> values are not the same. </summary>
+        /// <param name="left"> The left value to compare. </param>
+        /// <param name="right"> The right value to compare. </param>
         public static bool operator !=(TroubleshooterQuestionContentType left, TroubleshooterQuestionContentType right) => !left.Equals(right);
-        /// <summary> Converts a <see cref="string"/> to a <see cref="TroubleshooterQuestionContentType"/>. </summary>
+
+        /// <summary> Converts a string to a <see cref="TroubleshooterQuestionContentType"/>. </summary>
+        /// <param name="value"> The value. </param>
         public static implicit operator TroubleshooterQuestionContentType(string value) => new TroubleshooterQuestionContentType(value);
 
-        /// <inheritdoc />
+        /// <summary> Converts a string to a <see cref="TroubleshooterQuestionContentType"/>. </summary>
+        /// <param name="value"> The value. </param>
+        public static implicit operator TroubleshooterQuestionContentType?(string value) => value == null ? null : new TroubleshooterQuestionContentType(value);
+
+        /// <inheritdoc/>
         [EditorBrowsable(EditorBrowsableState.Never)]
         public override bool Equals(object obj) => obj is TroubleshooterQuestionContentType other && Equals(other);
-        /// <inheritdoc />
+
+        /// <inheritdoc/>
         public bool Equals(TroubleshooterQuestionContentType other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
 
-        /// <inheritdoc />
+        /// <inheritdoc/>
         [EditorBrowsable(EditorBrowsableState.Never)]
         public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
-        /// <inheritdoc />
+
+        /// <inheritdoc/>
         public override string ToString() => _value;
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/TroubleshooterQuestionType.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/TroubleshooterQuestionType.cs
index ff69f51f372a..8d980a31e324 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/TroubleshooterQuestionType.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/TroubleshooterQuestionType.cs
@@ -7,6 +7,7 @@
 
 using System;
 using System.ComponentModel;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
@@ -14,50 +15,77 @@ namespace Azure.ResourceManager.SelfHelp.Models
     public readonly partial struct TroubleshooterQuestionType : IEquatable<TroubleshooterQuestionType>
     {
         private readonly string _value;
-
-        /// <summary> Initializes a new instance of <see cref="TroubleshooterQuestionType"/>. </summary>
-        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
-        public TroubleshooterQuestionType(string value)
-        {
-            _value = value ?? throw new ArgumentNullException(nameof(value));
-        }
-
+        /// <summary> SingleChoice radio button. </summary>
         private const string RadioButtonValue = "RadioButton";
+        /// <summary> SingleChoice dropdown. </summary>
         private const string DropdownValue = "Dropdown";
+        /// <summary> Text Input. </summary>
         private const string TextInputValue = "TextInput";
+        /// <summary> MultiLineInfoBox. </summary>
         private const string MultiLineInfoBoxValue = "MultiLineInfoBox";
+        /// <summary> DateTime Picker. </summary>
         private const string DateTimePickerValue = "DateTimePicker";
+        /// <summary> Multi Select. </summary>
         private const string MultiSelectValue = "MultiSelect";
 
+        /// <summary> Initializes a new instance of <see cref="TroubleshooterQuestionType"/>. </summary>
+        /// <param name="value"> The value. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
+        public TroubleshooterQuestionType(string value)
+        {
+            Argument.AssertNotNull(value, nameof(value));
+
+            _value = value;
+        }
+
         /// <summary> SingleChoice radio button. </summary>
         public static TroubleshooterQuestionType RadioButton { get; } = new TroubleshooterQuestionType(RadioButtonValue);
+
         /// <summary> SingleChoice dropdown. </summary>
         public static TroubleshooterQuestionType Dropdown { get; } = new TroubleshooterQuestionType(DropdownValue);
+
         /// <summary> Text Input. </summary>
         public static TroubleshooterQuestionType TextInput { get; } = new TroubleshooterQuestionType(TextInputValue);
+
         /// <summary> MultiLineInfoBox. </summary>
         public static TroubleshooterQuestionType MultiLineInfoBox { get; } = new TroubleshooterQuestionType(MultiLineInfoBoxValue);
+
         /// <summary> DateTime Picker. </summary>
         public static TroubleshooterQuestionType DateTimePicker { get; } = new TroubleshooterQuestionType(DateTimePickerValue);
+
         /// <summary> Multi Select. </summary>
         public static TroubleshooterQuestionType MultiSelect { get; } = new TroubleshooterQuestionType(MultiSelectValue);
+
         /// <summary> Determines if two <see cref="TroubleshooterQuestionType"/> values are the same. </summary>
+        /// <param name="left"> The left value to compare. </param>
+        /// <param name="right"> The right value to compare. </param>
         public static bool operator ==(TroubleshooterQuestionType left, TroubleshooterQuestionType right) => left.Equals(right);
+
         /// <summary> Determines if two <see cref="TroubleshooterQuestionType"/> values are not the same. </summary>
+        /// <param name="left"> The left value to compare. </param>
+        /// <param name="right"> The right value to compare. </param>
         public static bool operator !=(TroubleshooterQuestionType left, TroubleshooterQuestionType right) => !left.Equals(right);
-        /// <summary> Converts a <see cref="string"/> to a <see cref="TroubleshooterQuestionType"/>. </summary>
+
+        /// <summary> Converts a string to a <see cref="TroubleshooterQuestionType"/>. </summary>
+        /// <param name="value"> The value. </param>
         public static implicit operator TroubleshooterQuestionType(string value) => new TroubleshooterQuestionType(value);
 
-        /// <inheritdoc />
+        /// <summary> Converts a string to a <see cref="TroubleshooterQuestionType"/>. </summary>
+        /// <param name="value"> The value. </param>
+        public static implicit operator TroubleshooterQuestionType?(string value) => value == null ? null : new TroubleshooterQuestionType(value);
+
+        /// <inheritdoc/>
         [EditorBrowsable(EditorBrowsableState.Never)]
         public override bool Equals(object obj) => obj is TroubleshooterQuestionType other && Equals(other);
-        /// <inheritdoc />
+
+        /// <inheritdoc/>
         public bool Equals(TroubleshooterQuestionType other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
 
-        /// <inheritdoc />
+        /// <inheritdoc/>
         [EditorBrowsable(EditorBrowsableState.Never)]
         public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
-        /// <inheritdoc />
+
+        /// <inheritdoc/>
         public override string ToString() => _value;
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/TroubleshooterResult.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/TroubleshooterResult.Serialization.cs
index 52014fbd07f0..71efd2de8ad0 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/TroubleshooterResult.Serialization.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/TroubleshooterResult.Serialization.cs
@@ -9,14 +9,15 @@
 using System.ClientModel.Primitives;
 using System.Collections.Generic;
 using System.Text.Json;
-using Azure.Core;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
-    public partial class TroubleshooterResult : IUtf8JsonSerializable, IJsonModel<TroubleshooterResult>
+    /// <summary> User Response for Troubleshooter continue request. </summary>
+    public partial class TroubleshooterResult : IJsonModel<TroubleshooterResult>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<TroubleshooterResult>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
+        /// <param name="writer"> The JSON writer. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
         void IJsonModel<TroubleshooterResult>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
@@ -28,12 +29,11 @@ void IJsonModel<TroubleshooterResult>.Write(Utf8JsonWriter writer, ModelReaderWr
         /// <param name="options"> The client options for reading and writing models. </param>
         protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<TroubleshooterResult>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<TroubleshooterResult>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(TroubleshooterResult)} does not support writing '{format}' format.");
             }
-
             if (Optional.IsDefined(QuestionId))
             {
                 writer.WritePropertyName("questionId"u8);
@@ -49,15 +49,15 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
                 writer.WritePropertyName("response"u8);
                 writer.WriteStringValue(Response);
             }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            if (options.Format != "W" && _additionalBinaryDataProperties != null)
             {
-                foreach (var item in _serializedAdditionalRawData)
+                foreach (var item in _additionalBinaryDataProperties)
                 {
                     writer.WritePropertyName(item.Key);
 #if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
+                    writer.WriteRawValue(item.Value);
 #else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value, ModelSerializationExtensions.JsonDocumentOptions))
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
                     {
                         JsonSerializer.Serialize(writer, document.RootElement);
                     }
@@ -66,22 +66,27 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             }
         }
 
-        TroubleshooterResult IJsonModel<TroubleshooterResult>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        TroubleshooterResult IJsonModel<TroubleshooterResult>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options);
+
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual TroubleshooterResult JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<TroubleshooterResult>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<TroubleshooterResult>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(TroubleshooterResult)} does not support reading '{format}' format.");
             }
-
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
             return DeserializeTroubleshooterResult(document.RootElement, options);
         }
 
-        internal static TroubleshooterResult DeserializeTroubleshooterResult(JsonElement element, ModelReaderWriterOptions options = null)
+        /// <param name="element"> The JSON element to deserialize. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        internal static TroubleshooterResult DeserializeTroubleshooterResult(JsonElement element, ModelReaderWriterOptions options)
         {
-            options ??= ModelSerializationExtensions.WireOptions;
-
             if (element.ValueKind == JsonValueKind.Null)
             {
                 return null;
@@ -89,42 +94,43 @@ internal static TroubleshooterResult DeserializeTroubleshooterResult(JsonElement
             string questionId = default;
             TroubleshooterQuestionType? questionType = default;
             string response = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
+            IDictionary<string, BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            foreach (var prop in element.EnumerateObject())
             {
-                if (property.NameEquals("questionId"u8))
+                if (prop.NameEquals("questionId"u8))
                 {
-                    questionId = property.Value.GetString();
+                    questionId = prop.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("questionType"u8))
+                if (prop.NameEquals("questionType"u8))
                 {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
-                    questionType = new TroubleshooterQuestionType(property.Value.GetString());
+                    questionType = new TroubleshooterQuestionType(prop.Value.GetString());
                     continue;
                 }
-                if (property.NameEquals("response"u8))
+                if (prop.NameEquals("response"u8))
                 {
-                    response = property.Value.GetString();
+                    response = prop.Value.GetString();
                     continue;
                 }
                 if (options.Format != "W")
                 {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                    additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText()));
                 }
             }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new TroubleshooterResult(questionId, questionType, response, serializedAdditionalRawData);
+            return new TroubleshooterResult(questionId, questionType, response, additionalBinaryDataProperties);
         }
 
-        BinaryData IPersistableModel<TroubleshooterResult>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<TroubleshooterResult>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="options"> The client options for reading and writing models. </param>
+        BinaryData IPersistableModel<TroubleshooterResult>.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
 
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<TroubleshooterResult>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
@@ -134,15 +140,20 @@ BinaryData IPersistableModel<TroubleshooterResult>.Write(ModelReaderWriterOption
             }
         }
 
-        TroubleshooterResult IPersistableModel<TroubleshooterResult>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<TroubleshooterResult>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        TroubleshooterResult IPersistableModel<TroubleshooterResult>.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options);
 
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual TroubleshooterResult PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<TroubleshooterResult>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
+                    using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
                     {
-                        using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
                         return DeserializeTroubleshooterResult(document.RootElement, options);
                     }
                 default:
@@ -150,6 +161,7 @@ TroubleshooterResult IPersistableModel<TroubleshooterResult>.Create(BinaryData d
             }
         }
 
+        /// <param name="options"> The client options for reading and writing models. </param>
         string IPersistableModel<TroubleshooterResult>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/TroubleshooterResult.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/TroubleshooterResult.cs
index 536baeeda8bc..30846077bda5 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/TroubleshooterResult.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/TroubleshooterResult.cs
@@ -13,37 +13,8 @@ namespace Azure.ResourceManager.SelfHelp.Models
     /// <summary> User Response for Troubleshooter continue request. </summary>
     public partial class TroubleshooterResult
     {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+        /// <summary> Keeps track of any properties unknown to the library. </summary>
+        private protected readonly IDictionary<string, BinaryData> _additionalBinaryDataProperties;
 
         /// <summary> Initializes a new instance of <see cref="TroubleshooterResult"/>. </summary>
         public TroubleshooterResult()
@@ -54,19 +25,21 @@ public TroubleshooterResult()
         /// <param name="questionId"> id of the question. </param>
         /// <param name="questionType"> Type of Question. </param>
         /// <param name="response"> Response key for SingleInput. For Multi-line test/open ended question it is free form text. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal TroubleshooterResult(string questionId, TroubleshooterQuestionType? questionType, string response, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        /// <param name="additionalBinaryDataProperties"> Keeps track of any properties unknown to the library. </param>
+        internal TroubleshooterResult(string questionId, TroubleshooterQuestionType? questionType, string response, IDictionary<string, BinaryData> additionalBinaryDataProperties)
         {
             QuestionId = questionId;
             QuestionType = questionType;
             Response = response;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
+            _additionalBinaryDataProperties = additionalBinaryDataProperties;
         }
 
         /// <summary> id of the question. </summary>
         public string QuestionId { get; set; }
+
         /// <summary> Type of Question. </summary>
         public TroubleshooterQuestionType? QuestionType { get; set; }
+
         /// <summary> Response key for SingleInput. For Multi-line test/open ended question it is free form text. </summary>
         public string Response { get; set; }
     }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/TroubleshooterStepInput.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/TroubleshooterStepInput.Serialization.cs
index 55f03b8f05e7..89bb84823218 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/TroubleshooterStepInput.Serialization.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/TroubleshooterStepInput.Serialization.cs
@@ -9,14 +9,15 @@
 using System.ClientModel.Primitives;
 using System.Collections.Generic;
 using System.Text.Json;
-using Azure.Core;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
-    public partial class TroubleshooterStepInput : IUtf8JsonSerializable, IJsonModel<TroubleshooterStepInput>
+    /// <summary> Details of step input. </summary>
+    public partial class TroubleshooterStepInput : IJsonModel<TroubleshooterStepInput>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<TroubleshooterStepInput>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
+        /// <param name="writer"> The JSON writer. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
         void IJsonModel<TroubleshooterStepInput>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
@@ -28,12 +29,11 @@ void IJsonModel<TroubleshooterStepInput>.Write(Utf8JsonWriter writer, ModelReade
         /// <param name="options"> The client options for reading and writing models. </param>
         protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<TroubleshooterStepInput>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<TroubleshooterStepInput>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(TroubleshooterStepInput)} does not support writing '{format}' format.");
             }
-
             if (Optional.IsDefined(QuestionId))
             {
                 writer.WritePropertyName("questionId"u8);
@@ -83,21 +83,21 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             {
                 writer.WritePropertyName("responseOptions"u8);
                 writer.WriteStartArray();
-                foreach (var item in ResponseOptions)
+                foreach (ResponseConfig item in ResponseOptions)
                 {
                     writer.WriteObjectValue(item, options);
                 }
                 writer.WriteEndArray();
             }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            if (options.Format != "W" && _additionalBinaryDataProperties != null)
             {
-                foreach (var item in _serializedAdditionalRawData)
+                foreach (var item in _additionalBinaryDataProperties)
                 {
                     writer.WritePropertyName(item.Key);
 #if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
+                    writer.WriteRawValue(item.Value);
 #else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value, ModelSerializationExtensions.JsonDocumentOptions))
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
                     {
                         JsonSerializer.Serialize(writer, document.RootElement);
                     }
@@ -106,22 +106,27 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             }
         }
 
-        TroubleshooterStepInput IJsonModel<TroubleshooterStepInput>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        TroubleshooterStepInput IJsonModel<TroubleshooterStepInput>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options);
+
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual TroubleshooterStepInput JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<TroubleshooterStepInput>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<TroubleshooterStepInput>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(TroubleshooterStepInput)} does not support reading '{format}' format.");
             }
-
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
             return DeserializeTroubleshooterStepInput(document.RootElement, options);
         }
 
-        internal static TroubleshooterStepInput DeserializeTroubleshooterStepInput(JsonElement element, ModelReaderWriterOptions options = null)
+        /// <param name="element"> The JSON element to deserialize. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        internal static TroubleshooterStepInput DeserializeTroubleshooterStepInput(JsonElement element, ModelReaderWriterOptions options)
         {
-            options ??= ModelSerializationExtensions.WireOptions;
-
             if (element.ValueKind == JsonValueKind.Null)
             {
                 return null;
@@ -135,76 +140,75 @@ internal static TroubleshooterStepInput DeserializeTroubleshooterStepInput(JsonE
             string recommendedOption = default;
             string selectedOptionValue = default;
             ResponseValidationProperties responseValidationProperties = default;
-            IReadOnlyList<ResponseConfig> responseOptions = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
+            IList<ResponseConfig> responseOptions = default;
+            IDictionary<string, BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            foreach (var prop in element.EnumerateObject())
             {
-                if (property.NameEquals("questionId"u8))
+                if (prop.NameEquals("questionId"u8))
                 {
-                    questionId = property.Value.GetString();
+                    questionId = prop.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("questionType"u8))
+                if (prop.NameEquals("questionType"u8))
                 {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
-                    questionType = new TroubleshooterQuestionType(property.Value.GetString());
+                    questionType = new TroubleshooterQuestionType(prop.Value.GetString());
                     continue;
                 }
-                if (property.NameEquals("questionTitle"u8))
+                if (prop.NameEquals("questionTitle"u8))
                 {
-                    questionTitle = property.Value.GetString();
+                    questionTitle = prop.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("questionContent"u8))
+                if (prop.NameEquals("questionContent"u8))
                 {
-                    questionContent = property.Value.GetString();
+                    questionContent = prop.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("questionContentType"u8))
+                if (prop.NameEquals("questionContentType"u8))
                 {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
-                    questionContentType = new TroubleshooterQuestionContentType(property.Value.GetString());
+                    questionContentType = new TroubleshooterQuestionContentType(prop.Value.GetString());
                     continue;
                 }
-                if (property.NameEquals("responseHint"u8))
+                if (prop.NameEquals("responseHint"u8))
                 {
-                    responseHint = property.Value.GetString();
+                    responseHint = prop.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("recommendedOption"u8))
+                if (prop.NameEquals("recommendedOption"u8))
                 {
-                    recommendedOption = property.Value.GetString();
+                    recommendedOption = prop.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("selectedOptionValue"u8))
+                if (prop.NameEquals("selectedOptionValue"u8))
                 {
-                    selectedOptionValue = property.Value.GetString();
+                    selectedOptionValue = prop.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("responseValidationProperties"u8))
+                if (prop.NameEquals("responseValidationProperties"u8))
                 {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
-                    responseValidationProperties = ResponseValidationProperties.DeserializeResponseValidationProperties(property.Value, options);
+                    responseValidationProperties = ResponseValidationProperties.DeserializeResponseValidationProperties(prop.Value, options);
                     continue;
                 }
-                if (property.NameEquals("responseOptions"u8))
+                if (prop.NameEquals("responseOptions"u8))
                 {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
                     List<ResponseConfig> array = new List<ResponseConfig>();
-                    foreach (var item in property.Value.EnumerateArray())
+                    foreach (var item in prop.Value.EnumerateArray())
                     {
                         array.Add(ResponseConfig.DeserializeResponseConfig(item, options));
                     }
@@ -213,10 +217,9 @@ internal static TroubleshooterStepInput DeserializeTroubleshooterStepInput(JsonE
                 }
                 if (options.Format != "W")
                 {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                    additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText()));
                 }
             }
-            serializedAdditionalRawData = rawDataDictionary;
             return new TroubleshooterStepInput(
                 questionId,
                 questionType,
@@ -228,13 +231,16 @@ internal static TroubleshooterStepInput DeserializeTroubleshooterStepInput(JsonE
                 selectedOptionValue,
                 responseValidationProperties,
                 responseOptions ?? new ChangeTrackingList<ResponseConfig>(),
-                serializedAdditionalRawData);
+                additionalBinaryDataProperties);
         }
 
-        BinaryData IPersistableModel<TroubleshooterStepInput>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<TroubleshooterStepInput>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="options"> The client options for reading and writing models. </param>
+        BinaryData IPersistableModel<TroubleshooterStepInput>.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
 
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<TroubleshooterStepInput>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
@@ -244,15 +250,20 @@ BinaryData IPersistableModel<TroubleshooterStepInput>.Write(ModelReaderWriterOpt
             }
         }
 
-        TroubleshooterStepInput IPersistableModel<TroubleshooterStepInput>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<TroubleshooterStepInput>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        TroubleshooterStepInput IPersistableModel<TroubleshooterStepInput>.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options);
 
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual TroubleshooterStepInput PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<TroubleshooterStepInput>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
+                    using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
                     {
-                        using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
                         return DeserializeTroubleshooterStepInput(document.RootElement, options);
                     }
                 default:
@@ -260,6 +271,7 @@ TroubleshooterStepInput IPersistableModel<TroubleshooterStepInput>.Create(Binary
             }
         }
 
+        /// <param name="options"> The client options for reading and writing models. </param>
         string IPersistableModel<TroubleshooterStepInput>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/TroubleshooterStepInput.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/TroubleshooterStepInput.cs
index 4d552226ff0f..6df91cf425f4 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/TroubleshooterStepInput.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/TroubleshooterStepInput.cs
@@ -7,43 +7,15 @@
 
 using System;
 using System.Collections.Generic;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
     /// <summary> Details of step input. </summary>
     public partial class TroubleshooterStepInput
     {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+        /// <summary> Keeps track of any properties unknown to the library. </summary>
+        private protected readonly IDictionary<string, BinaryData> _additionalBinaryDataProperties;
 
         /// <summary> Initializes a new instance of <see cref="TroubleshooterStepInput"/>. </summary>
         internal TroubleshooterStepInput()
@@ -62,8 +34,8 @@ internal TroubleshooterStepInput()
         /// <param name="selectedOptionValue"> Text of response that was selected. </param>
         /// <param name="responseValidationProperties"> Troubleshooter step input response validation properties. </param>
         /// <param name="responseOptions"></param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal TroubleshooterStepInput(string questionId, TroubleshooterQuestionType? questionType, string questionTitle, string questionContent, TroubleshooterQuestionContentType? questionContentType, string responseHint, string recommendedOption, string selectedOptionValue, ResponseValidationProperties responseValidationProperties, IReadOnlyList<ResponseConfig> responseOptions, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        /// <param name="additionalBinaryDataProperties"> Keeps track of any properties unknown to the library. </param>
+        internal TroubleshooterStepInput(string questionId, TroubleshooterQuestionType? questionType, string questionTitle, string questionContent, TroubleshooterQuestionContentType? questionContentType, string responseHint, string recommendedOption, string selectedOptionValue, ResponseValidationProperties responseValidationProperties, IList<ResponseConfig> responseOptions, IDictionary<string, BinaryData> additionalBinaryDataProperties)
         {
             QuestionId = questionId;
             QuestionType = questionType;
@@ -75,28 +47,37 @@ internal TroubleshooterStepInput(string questionId, TroubleshooterQuestionType?
             SelectedOptionValue = selectedOptionValue;
             ResponseValidationProperties = responseValidationProperties;
             ResponseOptions = responseOptions;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
+            _additionalBinaryDataProperties = additionalBinaryDataProperties;
         }
 
         /// <summary> Use Index as QuestionId. </summary>
         public string QuestionId { get; }
+
         /// <summary> Type of Question. </summary>
         public TroubleshooterQuestionType? QuestionType { get; }
+
         /// <summary> Question title. </summary>
         public string QuestionTitle { get; }
+
         /// <summary> User question content. </summary>
         public string QuestionContent { get; }
+
         /// <summary> Default is Text. </summary>
         public TroubleshooterQuestionContentType? QuestionContentType { get; }
+
         /// <summary> Place holder text for response hints. </summary>
         public string ResponseHint { get; }
+
         /// <summary> Result of Automate step. </summary>
         public string RecommendedOption { get; }
+
         /// <summary> Text of response that was selected. </summary>
         public string SelectedOptionValue { get; }
+
         /// <summary> Troubleshooter step input response validation properties. </summary>
         public ResponseValidationProperties ResponseValidationProperties { get; }
-        /// <summary> Gets the response options. </summary>
-        public IReadOnlyList<ResponseConfig> ResponseOptions { get; }
+
+        /// <summary> Gets the ResponseOptions. </summary>
+        public IList<ResponseConfig> ResponseOptions { get; }
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/TroubleshooterValidationScope.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/TroubleshooterValidationScope.cs
index 972dc19200cd..478f3d44af39 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/TroubleshooterValidationScope.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/TroubleshooterValidationScope.cs
@@ -7,6 +7,7 @@
 
 using System;
 using System.ComponentModel;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
@@ -14,47 +15,67 @@ namespace Azure.ResourceManager.SelfHelp.Models
     public readonly partial struct TroubleshooterValidationScope : IEquatable<TroubleshooterValidationScope>
     {
         private readonly string _value;
+        private const string NoneValue = "None";
+        private const string UrlFormatValue = "URLFormat";
+        private const string GuidFormatValue = "GuidFormat";
+        private const string IpAddressFormatValue = "IpAddressFormat";
+        private const string NumberOnlyFormatValue = "NumberOnlyFormat";
 
         /// <summary> Initializes a new instance of <see cref="TroubleshooterValidationScope"/>. </summary>
+        /// <param name="value"> The value. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
         public TroubleshooterValidationScope(string value)
         {
-            _value = value ?? throw new ArgumentNullException(nameof(value));
-        }
+            Argument.AssertNotNull(value, nameof(value));
 
-        private const string NoneValue = "None";
-        private const string UrlFormatValue = "URLFormat";
-        private const string GuidFormatValue = "GuidFormat";
-        private const string IPAddressFormatValue = "IpAddressFormat";
-        private const string NumberOnlyFormatValue = "NumberOnlyFormat";
+            _value = value;
+        }
 
-        /// <summary> None. </summary>
+        /// <summary> Gets the None. </summary>
         public static TroubleshooterValidationScope None { get; } = new TroubleshooterValidationScope(NoneValue);
-        /// <summary> URLFormat. </summary>
+
+        /// <summary> Gets the UrlFormat. </summary>
         public static TroubleshooterValidationScope UrlFormat { get; } = new TroubleshooterValidationScope(UrlFormatValue);
-        /// <summary> GuidFormat. </summary>
+
+        /// <summary> Gets the GuidFormat. </summary>
         public static TroubleshooterValidationScope GuidFormat { get; } = new TroubleshooterValidationScope(GuidFormatValue);
-        /// <summary> IpAddressFormat. </summary>
-        public static TroubleshooterValidationScope IPAddressFormat { get; } = new TroubleshooterValidationScope(IPAddressFormatValue);
-        /// <summary> NumberOnlyFormat. </summary>
+
+        /// <summary> Gets the IpAddressFormat. </summary>
+        public static TroubleshooterValidationScope IpAddressFormat { get; } = new TroubleshooterValidationScope(IpAddressFormatValue);
+
+        /// <summary> Gets the NumberOnlyFormat. </summary>
         public static TroubleshooterValidationScope NumberOnlyFormat { get; } = new TroubleshooterValidationScope(NumberOnlyFormatValue);
+
         /// <summary> Determines if two <see cref="TroubleshooterValidationScope"/> values are the same. </summary>
+        /// <param name="left"> The left value to compare. </param>
+        /// <param name="right"> The right value to compare. </param>
         public static bool operator ==(TroubleshooterValidationScope left, TroubleshooterValidationScope right) => left.Equals(right);
+
         /// <summary> Determines if two <see cref="TroubleshooterValidationScope"/> values are not the same. </summary>
+        /// <param name="left"> The left value to compare. </param>
+        /// <param name="right"> The right value to compare. </param>
         public static bool operator !=(TroubleshooterValidationScope left, TroubleshooterValidationScope right) => !left.Equals(right);
-        /// <summary> Converts a <see cref="string"/> to a <see cref="TroubleshooterValidationScope"/>. </summary>
+
+        /// <summary> Converts a string to a <see cref="TroubleshooterValidationScope"/>. </summary>
+        /// <param name="value"> The value. </param>
         public static implicit operator TroubleshooterValidationScope(string value) => new TroubleshooterValidationScope(value);
 
-        /// <inheritdoc />
+        /// <summary> Converts a string to a <see cref="TroubleshooterValidationScope"/>. </summary>
+        /// <param name="value"> The value. </param>
+        public static implicit operator TroubleshooterValidationScope?(string value) => value == null ? null : new TroubleshooterValidationScope(value);
+
+        /// <inheritdoc/>
         [EditorBrowsable(EditorBrowsableState.Never)]
         public override bool Equals(object obj) => obj is TroubleshooterValidationScope other && Equals(other);
-        /// <inheritdoc />
+
+        /// <inheritdoc/>
         public bool Equals(TroubleshooterValidationScope other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
 
-        /// <inheritdoc />
+        /// <inheritdoc/>
         [EditorBrowsable(EditorBrowsableState.Never)]
         public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
-        /// <inheritdoc />
+
+        /// <inheritdoc/>
         public override string ToString() => _value;
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/VideoGroupDetail.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/VideoGroupDetail.Serialization.cs
index 24bb3d16f5df..ca08255f61cc 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/VideoGroupDetail.Serialization.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/VideoGroupDetail.Serialization.cs
@@ -9,14 +9,15 @@
 using System.ClientModel.Primitives;
 using System.Collections.Generic;
 using System.Text.Json;
-using Azure.Core;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
-    public partial class VideoGroupDetail : IUtf8JsonSerializable, IJsonModel<VideoGroupDetail>
+    /// <summary> Video group detail. </summary>
+    public partial class VideoGroupDetail : IJsonModel<VideoGroupDetail>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<VideoGroupDetail>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
+        /// <param name="writer"> The JSON writer. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
         void IJsonModel<VideoGroupDetail>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
@@ -28,17 +29,16 @@ void IJsonModel<VideoGroupDetail>.Write(Utf8JsonWriter writer, ModelReaderWriter
         /// <param name="options"> The client options for reading and writing models. </param>
         protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<VideoGroupDetail>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<VideoGroupDetail>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(VideoGroupDetail)} does not support writing '{format}' format.");
             }
-
             if (Optional.IsCollectionDefined(Videos))
             {
                 writer.WritePropertyName("videos"u8);
                 writer.WriteStartArray();
-                foreach (var item in Videos)
+                foreach (VideoGroupVideo item in Videos)
                 {
                     writer.WriteObjectValue(item, options);
                 }
@@ -49,15 +49,15 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
                 writer.WritePropertyName("replacementKey"u8);
                 writer.WriteStringValue(ReplacementKey);
             }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            if (options.Format != "W" && _additionalBinaryDataProperties != null)
             {
-                foreach (var item in _serializedAdditionalRawData)
+                foreach (var item in _additionalBinaryDataProperties)
                 {
                     writer.WritePropertyName(item.Key);
 #if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
+                    writer.WriteRawValue(item.Value);
 #else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value, ModelSerializationExtensions.JsonDocumentOptions))
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
                     {
                         JsonSerializer.Serialize(writer, document.RootElement);
                     }
@@ -66,64 +66,70 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             }
         }
 
-        VideoGroupDetail IJsonModel<VideoGroupDetail>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        VideoGroupDetail IJsonModel<VideoGroupDetail>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options);
+
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual VideoGroupDetail JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<VideoGroupDetail>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<VideoGroupDetail>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(VideoGroupDetail)} does not support reading '{format}' format.");
             }
-
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
             return DeserializeVideoGroupDetail(document.RootElement, options);
         }
 
-        internal static VideoGroupDetail DeserializeVideoGroupDetail(JsonElement element, ModelReaderWriterOptions options = null)
+        /// <param name="element"> The JSON element to deserialize. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        internal static VideoGroupDetail DeserializeVideoGroupDetail(JsonElement element, ModelReaderWriterOptions options)
         {
-            options ??= ModelSerializationExtensions.WireOptions;
-
             if (element.ValueKind == JsonValueKind.Null)
             {
                 return null;
             }
-            IReadOnlyList<VideoGroupVideo> videos = default;
+            IList<VideoGroupVideo> videos = default;
             string replacementKey = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
+            IDictionary<string, BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            foreach (var prop in element.EnumerateObject())
             {
-                if (property.NameEquals("videos"u8))
+                if (prop.NameEquals("videos"u8))
                 {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
                     List<VideoGroupVideo> array = new List<VideoGroupVideo>();
-                    foreach (var item in property.Value.EnumerateArray())
+                    foreach (var item in prop.Value.EnumerateArray())
                     {
                         array.Add(VideoGroupVideo.DeserializeVideoGroupVideo(item, options));
                     }
                     videos = array;
                     continue;
                 }
-                if (property.NameEquals("replacementKey"u8))
+                if (prop.NameEquals("replacementKey"u8))
                 {
-                    replacementKey = property.Value.GetString();
+                    replacementKey = prop.Value.GetString();
                     continue;
                 }
                 if (options.Format != "W")
                 {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                    additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText()));
                 }
             }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new VideoGroupDetail(videos ?? new ChangeTrackingList<VideoGroupVideo>(), replacementKey, serializedAdditionalRawData);
+            return new VideoGroupDetail(videos ?? new ChangeTrackingList<VideoGroupVideo>(), replacementKey, additionalBinaryDataProperties);
         }
 
-        BinaryData IPersistableModel<VideoGroupDetail>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<VideoGroupDetail>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="options"> The client options for reading and writing models. </param>
+        BinaryData IPersistableModel<VideoGroupDetail>.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
 
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<VideoGroupDetail>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
@@ -133,15 +139,20 @@ BinaryData IPersistableModel<VideoGroupDetail>.Write(ModelReaderWriterOptions op
             }
         }
 
-        VideoGroupDetail IPersistableModel<VideoGroupDetail>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<VideoGroupDetail>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        VideoGroupDetail IPersistableModel<VideoGroupDetail>.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options);
 
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual VideoGroupDetail PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<VideoGroupDetail>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
+                    using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
                     {
-                        using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
                         return DeserializeVideoGroupDetail(document.RootElement, options);
                     }
                 default:
@@ -149,6 +160,7 @@ VideoGroupDetail IPersistableModel<VideoGroupDetail>.Create(BinaryData data, Mod
             }
         }
 
+        /// <param name="options"> The client options for reading and writing models. </param>
         string IPersistableModel<VideoGroupDetail>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/VideoGroupDetail.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/VideoGroupDetail.cs
index 9714f440f522..dc4a5bb6826d 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/VideoGroupDetail.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/VideoGroupDetail.cs
@@ -7,43 +7,15 @@
 
 using System;
 using System.Collections.Generic;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
     /// <summary> Video group detail. </summary>
     public partial class VideoGroupDetail
     {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+        /// <summary> Keeps track of any properties unknown to the library. </summary>
+        private protected readonly IDictionary<string, BinaryData> _additionalBinaryDataProperties;
 
         /// <summary> Initializes a new instance of <see cref="VideoGroupDetail"/>. </summary>
         internal VideoGroupDetail()
@@ -54,16 +26,17 @@ internal VideoGroupDetail()
         /// <summary> Initializes a new instance of <see cref="VideoGroupDetail"/>. </summary>
         /// <param name="videos"> List of videos will be shown to customers. </param>
         /// <param name="replacementKey"> Place holder used in HTML Content replace control with the insight content. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal VideoGroupDetail(IReadOnlyList<VideoGroupVideo> videos, string replacementKey, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        /// <param name="additionalBinaryDataProperties"> Keeps track of any properties unknown to the library. </param>
+        internal VideoGroupDetail(IList<VideoGroupVideo> videos, string replacementKey, IDictionary<string, BinaryData> additionalBinaryDataProperties)
         {
             Videos = videos;
             ReplacementKey = replacementKey;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
+            _additionalBinaryDataProperties = additionalBinaryDataProperties;
         }
 
         /// <summary> List of videos will be shown to customers. </summary>
-        public IReadOnlyList<VideoGroupVideo> Videos { get; }
+        public IList<VideoGroupVideo> Videos { get; }
+
         /// <summary> Place holder used in HTML Content replace control with the insight content. </summary>
         public string ReplacementKey { get; }
     }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/VideoGroupVideo.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/VideoGroupVideo.Serialization.cs
index 4293da029b14..54e621e9bb55 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/VideoGroupVideo.Serialization.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/VideoGroupVideo.Serialization.cs
@@ -9,14 +9,15 @@
 using System.ClientModel.Primitives;
 using System.Collections.Generic;
 using System.Text.Json;
-using Azure.Core;
+using Azure.ResourceManager.SelfHelp;
 
 namespace Azure.ResourceManager.SelfHelp.Models
 {
-    public partial class VideoGroupVideo : IUtf8JsonSerializable, IJsonModel<VideoGroupVideo>
+    /// <summary> VideoGroup video detail. </summary>
+    public partial class VideoGroupVideo : IJsonModel<VideoGroupVideo>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<VideoGroupVideo>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
+        /// <param name="writer"> The JSON writer. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
         void IJsonModel<VideoGroupVideo>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
@@ -28,12 +29,11 @@ void IJsonModel<VideoGroupVideo>.Write(Utf8JsonWriter writer, ModelReaderWriterO
         /// <param name="options"> The client options for reading and writing models. </param>
         protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<VideoGroupVideo>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<VideoGroupVideo>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(VideoGroupVideo)} does not support writing '{format}' format.");
             }
-
             if (Optional.IsDefined(Src))
             {
                 writer.WritePropertyName("src"u8);
@@ -44,15 +44,15 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
                 writer.WritePropertyName("title"u8);
                 writer.WriteStringValue(Title);
             }
-            if (options.Format != "W" && _serializedAdditionalRawData != null)
+            if (options.Format != "W" && _additionalBinaryDataProperties != null)
             {
-                foreach (var item in _serializedAdditionalRawData)
+                foreach (var item in _additionalBinaryDataProperties)
                 {
                     writer.WritePropertyName(item.Key);
 #if NET6_0_OR_GREATER
-				writer.WriteRawValue(item.Value);
+                    writer.WriteRawValue(item.Value);
 #else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value, ModelSerializationExtensions.JsonDocumentOptions))
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
                     {
                         JsonSerializer.Serialize(writer, document.RootElement);
                     }
@@ -61,55 +61,61 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             }
         }
 
-        VideoGroupVideo IJsonModel<VideoGroupVideo>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        VideoGroupVideo IJsonModel<VideoGroupVideo>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options);
+
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual VideoGroupVideo JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<VideoGroupVideo>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<VideoGroupVideo>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(VideoGroupVideo)} does not support reading '{format}' format.");
             }
-
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
             return DeserializeVideoGroupVideo(document.RootElement, options);
         }
 
-        internal static VideoGroupVideo DeserializeVideoGroupVideo(JsonElement element, ModelReaderWriterOptions options = null)
+        /// <param name="element"> The JSON element to deserialize. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        internal static VideoGroupVideo DeserializeVideoGroupVideo(JsonElement element, ModelReaderWriterOptions options)
         {
-            options ??= ModelSerializationExtensions.WireOptions;
-
             if (element.ValueKind == JsonValueKind.Null)
             {
                 return null;
             }
             string src = default;
             string title = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
+            IDictionary<string, BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            foreach (var prop in element.EnumerateObject())
             {
-                if (property.NameEquals("src"u8))
+                if (prop.NameEquals("src"u8))
                 {
-                    src = property.Value.GetString();
+                    src = prop.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("title"u8))
+                if (prop.NameEquals("title"u8))
                 {
-                    title = property.Value.GetString();
+                    title = prop.Value.GetString();
                     continue;
                 }
                 if (options.Format != "W")
                 {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                    additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText()));
                 }
             }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new VideoGroupVideo(src, title, serializedAdditionalRawData);
+            return new VideoGroupVideo(src, title, additionalBinaryDataProperties);
         }
 
-        BinaryData IPersistableModel<VideoGroupVideo>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<VideoGroupVideo>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="options"> The client options for reading and writing models. </param>
+        BinaryData IPersistableModel<VideoGroupVideo>.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
 
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<VideoGroupVideo>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
@@ -119,15 +125,20 @@ BinaryData IPersistableModel<VideoGroupVideo>.Write(ModelReaderWriterOptions opt
             }
         }
 
-        VideoGroupVideo IPersistableModel<VideoGroupVideo>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<VideoGroupVideo>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        VideoGroupVideo IPersistableModel<VideoGroupVideo>.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options);
 
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual VideoGroupVideo PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<VideoGroupVideo>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
+                    using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
                     {
-                        using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
                         return DeserializeVideoGroupVideo(document.RootElement, options);
                     }
                 default:
@@ -135,6 +146,7 @@ VideoGroupVideo IPersistableModel<VideoGroupVideo>.Create(BinaryData data, Model
             }
         }
 
+        /// <param name="options"> The client options for reading and writing models. </param>
         string IPersistableModel<VideoGroupVideo>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/VideoGroupVideo.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/VideoGroupVideo.cs
index a8eb07b9ef25..6bad8b5826d9 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/VideoGroupVideo.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/Models/VideoGroupVideo.cs
@@ -13,37 +13,8 @@ namespace Azure.ResourceManager.SelfHelp.Models
     /// <summary> VideoGroup video detail. </summary>
     public partial class VideoGroupVideo
     {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private protected IDictionary<string, BinaryData> _serializedAdditionalRawData;
+        /// <summary> Keeps track of any properties unknown to the library. </summary>
+        private protected readonly IDictionary<string, BinaryData> _additionalBinaryDataProperties;
 
         /// <summary> Initializes a new instance of <see cref="VideoGroupVideo"/>. </summary>
         internal VideoGroupVideo()
@@ -53,16 +24,17 @@ internal VideoGroupVideo()
         /// <summary> Initializes a new instance of <see cref="VideoGroupVideo"/>. </summary>
         /// <param name="src"> Link to the video. </param>
         /// <param name="title"> Title of the video. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal VideoGroupVideo(string src, string title, IDictionary<string, BinaryData> serializedAdditionalRawData)
+        /// <param name="additionalBinaryDataProperties"> Keeps track of any properties unknown to the library. </param>
+        internal VideoGroupVideo(string src, string title, IDictionary<string, BinaryData> additionalBinaryDataProperties)
         {
             Src = src;
             Title = title;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
+            _additionalBinaryDataProperties = additionalBinaryDataProperties;
         }
 
         /// <summary> Link to the video. </summary>
         public string Src { get; }
+
         /// <summary> Title of the video. </summary>
         public string Title { get; }
     }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/ProviderConstants.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/ProviderConstants.cs
index 93312bff5f70..60a265a6f12b 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/ProviderConstants.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/ProviderConstants.cs
@@ -9,8 +9,9 @@
 
 namespace Azure.ResourceManager.SelfHelp
 {
-    internal static class ProviderConstants
+    internal static partial class ProviderConstants
     {
+        /// <summary> Gets the DefaultProviderNamespace. </summary>
         public static string DefaultProviderNamespace { get; } = ClientDiagnostics.GetResourceProviderNamespace(typeof(ProviderConstants).Assembly);
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/RestOperations/CheckNameAvailabilityRestOperations.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/RestOperations/CheckNameAvailabilityRestOperations.cs
deleted file mode 100644
index 7143a0d9b2a3..000000000000
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/RestOperations/CheckNameAvailabilityRestOperations.cs
+++ /dev/null
@@ -1,124 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Text.Json;
-using System.Threading;
-using System.Threading.Tasks;
-using Azure.Core;
-using Azure.Core.Pipeline;
-using Azure.ResourceManager.SelfHelp.Models;
-
-namespace Azure.ResourceManager.SelfHelp
-{
-    internal partial class CheckNameAvailabilityRestOperations
-    {
-        private readonly TelemetryDetails _userAgent;
-        private readonly HttpPipeline _pipeline;
-        private readonly Uri _endpoint;
-        private readonly string _apiVersion;
-
-        /// <summary> Initializes a new instance of CheckNameAvailabilityRestOperations. </summary>
-        /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
-        /// <param name="applicationId"> The application id to use for user agent. </param>
-        /// <param name="endpoint"> Service host. </param>
-        /// <param name="apiVersion"> The API version to use for this operation. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="pipeline"/> or <paramref name="apiVersion"/> is null. </exception>
-        public CheckNameAvailabilityRestOperations(HttpPipeline pipeline, string applicationId, Uri endpoint = null, string apiVersion = default)
-        {
-            _pipeline = pipeline ?? throw new ArgumentNullException(nameof(pipeline));
-            _endpoint = endpoint ?? new Uri("https://management.azure.com");
-            _apiVersion = apiVersion ?? "2024-03-01-preview";
-            _userAgent = new TelemetryDetails(GetType().Assembly, applicationId);
-        }
-
-        internal RequestUriBuilder CreateCheckSelfHelpNameAvailabilityRequestUri(string scope, SelfHelpNameAvailabilityContent content)
-        {
-            var uri = new RawRequestUriBuilder();
-            uri.Reset(_endpoint);
-            uri.AppendPath("/", false);
-            uri.AppendPath(scope, false);
-            uri.AppendPath("/providers/Microsoft.Help/checkNameAvailability", false);
-            uri.AppendQuery("api-version", _apiVersion, true);
-            return uri;
-        }
-
-        internal HttpMessage CreateCheckSelfHelpNameAvailabilityRequest(string scope, SelfHelpNameAvailabilityContent content)
-        {
-            var message = _pipeline.CreateMessage();
-            var request = message.Request;
-            request.Method = RequestMethod.Post;
-            var uri = new RawRequestUriBuilder();
-            uri.Reset(_endpoint);
-            uri.AppendPath("/", false);
-            uri.AppendPath(scope, false);
-            uri.AppendPath("/providers/Microsoft.Help/checkNameAvailability", false);
-            uri.AppendQuery("api-version", _apiVersion, true);
-            request.Uri = uri;
-            request.Headers.Add("Accept", "application/json");
-            if (content != null)
-            {
-                request.Headers.Add("Content-Type", "application/json");
-                var content0 = new Utf8JsonRequestContent();
-                content0.JsonWriter.WriteObjectValue(content, ModelSerializationExtensions.WireOptions);
-                request.Content = content0;
-            }
-            _userAgent.Apply(message);
-            return message;
-        }
-
-        /// <summary> This API is used to check the uniqueness of a resource name used for a diagnostic, troubleshooter or solutions. </summary>
-        /// <param name="scope"> The fully qualified Azure Resource manager identifier of the resource. </param>
-        /// <param name="content"> The required parameters for availability check. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="scope"/> is null. </exception>
-        public async Task<Response<SelfHelpNameAvailabilityResult>> CheckSelfHelpNameAvailabilityAsync(string scope, SelfHelpNameAvailabilityContent content = null, CancellationToken cancellationToken = default)
-        {
-            Argument.AssertNotNull(scope, nameof(scope));
-
-            using var message = CreateCheckSelfHelpNameAvailabilityRequest(scope, content);
-            await _pipeline.SendAsync(message, cancellationToken).ConfigureAwait(false);
-            switch (message.Response.Status)
-            {
-                case 200:
-                    {
-                        SelfHelpNameAvailabilityResult value = default;
-                        using var document = await JsonDocument.ParseAsync(message.Response.ContentStream, ModelSerializationExtensions.JsonDocumentOptions, cancellationToken).ConfigureAwait(false);
-                        value = SelfHelpNameAvailabilityResult.DeserializeSelfHelpNameAvailabilityResult(document.RootElement);
-                        return Response.FromValue(value, message.Response);
-                    }
-                default:
-                    throw new RequestFailedException(message.Response);
-            }
-        }
-
-        /// <summary> This API is used to check the uniqueness of a resource name used for a diagnostic, troubleshooter or solutions. </summary>
-        /// <param name="scope"> The fully qualified Azure Resource manager identifier of the resource. </param>
-        /// <param name="content"> The required parameters for availability check. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="scope"/> is null. </exception>
-        public Response<SelfHelpNameAvailabilityResult> CheckSelfHelpNameAvailability(string scope, SelfHelpNameAvailabilityContent content = null, CancellationToken cancellationToken = default)
-        {
-            Argument.AssertNotNull(scope, nameof(scope));
-
-            using var message = CreateCheckSelfHelpNameAvailabilityRequest(scope, content);
-            _pipeline.Send(message, cancellationToken);
-            switch (message.Response.Status)
-            {
-                case 200:
-                    {
-                        SelfHelpNameAvailabilityResult value = default;
-                        using var document = JsonDocument.Parse(message.Response.ContentStream, ModelSerializationExtensions.JsonDocumentOptions);
-                        value = SelfHelpNameAvailabilityResult.DeserializeSelfHelpNameAvailabilityResult(document.RootElement);
-                        return Response.FromValue(value, message.Response);
-                    }
-                default:
-                    throw new RequestFailedException(message.Response);
-            }
-        }
-    }
-}
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/RestOperations/DiagnosticResourcesRestOperations.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/RestOperations/DiagnosticResourcesRestOperations.cs
index 8fe9685e6815..245aa9fb8f2d 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/RestOperations/DiagnosticResourcesRestOperations.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/RestOperations/DiagnosticResourcesRestOperations.cs
@@ -6,205 +6,78 @@
 #nullable disable
 
 using System;
-using System.Text.Json;
-using System.Threading;
-using System.Threading.Tasks;
+using Azure;
 using Azure.Core;
 using Azure.Core.Pipeline;
 
 namespace Azure.ResourceManager.SelfHelp
 {
-    internal partial class DiagnosticResourcesRestOperations
+    internal partial class DiagnosticResources
     {
-        private readonly TelemetryDetails _userAgent;
-        private readonly HttpPipeline _pipeline;
         private readonly Uri _endpoint;
         private readonly string _apiVersion;
 
-        /// <summary> Initializes a new instance of DiagnosticResourcesRestOperations. </summary>
-        /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
-        /// <param name="applicationId"> The application id to use for user agent. </param>
-        /// <param name="endpoint"> Service host. </param>
-        /// <param name="apiVersion"> The API version to use for this operation. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="pipeline"/> or <paramref name="apiVersion"/> is null. </exception>
-        public DiagnosticResourcesRestOperations(HttpPipeline pipeline, string applicationId, Uri endpoint = null, string apiVersion = default)
+        /// <summary> Initializes a new instance of DiagnosticResources for mocking. </summary>
+        protected DiagnosticResources()
         {
-            _pipeline = pipeline ?? throw new ArgumentNullException(nameof(pipeline));
-            _endpoint = endpoint ?? new Uri("https://management.azure.com");
-            _apiVersion = apiVersion ?? "2024-03-01-preview";
-            _userAgent = new TelemetryDetails(GetType().Assembly, applicationId);
         }
 
-        internal RequestUriBuilder CreateGetRequestUri(string scope, string diagnosticsResourceName)
+        /// <summary> Initializes a new instance of DiagnosticResources. </summary>
+        /// <param name="clientDiagnostics"> The ClientDiagnostics is used to provide tracing support for the client library. </param>
+        /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
+        /// <param name="endpoint"> Service endpoint. </param>
+        /// <param name="apiVersion"></param>
+        internal DiagnosticResources(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, Uri endpoint, string apiVersion)
         {
-            var uri = new RawRequestUriBuilder();
-            uri.Reset(_endpoint);
-            uri.AppendPath("/", false);
-            uri.AppendPath(scope, false);
-            uri.AppendPath("/providers/Microsoft.Help/diagnostics/", false);
-            uri.AppendPath(diagnosticsResourceName, true);
-            uri.AppendQuery("api-version", _apiVersion, true);
-            return uri;
+            ClientDiagnostics = clientDiagnostics;
+            _endpoint = endpoint;
+            Pipeline = pipeline;
+            _apiVersion = apiVersion;
         }
 
-        internal HttpMessage CreateGetRequest(string scope, string diagnosticsResourceName)
-        {
-            var message = _pipeline.CreateMessage();
-            var request = message.Request;
-            request.Method = RequestMethod.Get;
-            var uri = new RawRequestUriBuilder();
-            uri.Reset(_endpoint);
-            uri.AppendPath("/", false);
-            uri.AppendPath(scope, false);
-            uri.AppendPath("/providers/Microsoft.Help/diagnostics/", false);
-            uri.AppendPath(diagnosticsResourceName, true);
-            uri.AppendQuery("api-version", _apiVersion, true);
-            request.Uri = uri;
-            request.Headers.Add("Accept", "application/json");
-            _userAgent.Apply(message);
-            return message;
-        }
+        /// <summary> The HTTP pipeline for sending and receiving REST requests and responses. </summary>
+        public virtual HttpPipeline Pipeline { get; }
 
-        /// <summary> Get the diagnostics using the 'diagnosticsResourceName' you chose while creating the diagnostic. </summary>
-        /// <param name="scope"> The fully qualified Azure Resource manager identifier of the resource. </param>
-        /// <param name="diagnosticsResourceName"> Unique resource name for insight resources. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="scope"/> or <paramref name="diagnosticsResourceName"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="diagnosticsResourceName"/> is an empty string, and was expected to be non-empty. </exception>
-        public async Task<Response<SelfHelpDiagnosticData>> GetAsync(string scope, string diagnosticsResourceName, CancellationToken cancellationToken = default)
-        {
-            Argument.AssertNotNull(scope, nameof(scope));
-            Argument.AssertNotNullOrEmpty(diagnosticsResourceName, nameof(diagnosticsResourceName));
-
-            using var message = CreateGetRequest(scope, diagnosticsResourceName);
-            await _pipeline.SendAsync(message, cancellationToken).ConfigureAwait(false);
-            switch (message.Response.Status)
-            {
-                case 200:
-                    {
-                        SelfHelpDiagnosticData value = default;
-                        using var document = await JsonDocument.ParseAsync(message.Response.ContentStream, ModelSerializationExtensions.JsonDocumentOptions, cancellationToken).ConfigureAwait(false);
-                        value = SelfHelpDiagnosticData.DeserializeSelfHelpDiagnosticData(document.RootElement);
-                        return Response.FromValue(value, message.Response);
-                    }
-                case 404:
-                    return Response.FromValue((SelfHelpDiagnosticData)null, message.Response);
-                default:
-                    throw new RequestFailedException(message.Response);
-            }
-        }
+        /// <summary> The ClientDiagnostics is used to provide tracing support for the client library. </summary>
+        internal ClientDiagnostics ClientDiagnostics { get; }
 
-        /// <summary> Get the diagnostics using the 'diagnosticsResourceName' you chose while creating the diagnostic. </summary>
-        /// <param name="scope"> The fully qualified Azure Resource manager identifier of the resource. </param>
-        /// <param name="diagnosticsResourceName"> Unique resource name for insight resources. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="scope"/> or <paramref name="diagnosticsResourceName"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="diagnosticsResourceName"/> is an empty string, and was expected to be non-empty. </exception>
-        public Response<SelfHelpDiagnosticData> Get(string scope, string diagnosticsResourceName, CancellationToken cancellationToken = default)
+        internal HttpMessage CreateGetRequest(string scope, string diagnosticsResourceName, RequestContext context)
         {
-            Argument.AssertNotNull(scope, nameof(scope));
-            Argument.AssertNotNullOrEmpty(diagnosticsResourceName, nameof(diagnosticsResourceName));
-
-            using var message = CreateGetRequest(scope, diagnosticsResourceName);
-            _pipeline.Send(message, cancellationToken);
-            switch (message.Response.Status)
-            {
-                case 200:
-                    {
-                        SelfHelpDiagnosticData value = default;
-                        using var document = JsonDocument.Parse(message.Response.ContentStream, ModelSerializationExtensions.JsonDocumentOptions);
-                        value = SelfHelpDiagnosticData.DeserializeSelfHelpDiagnosticData(document.RootElement);
-                        return Response.FromValue(value, message.Response);
-                    }
-                case 404:
-                    return Response.FromValue((SelfHelpDiagnosticData)null, message.Response);
-                default:
-                    throw new RequestFailedException(message.Response);
-            }
-        }
-
-        internal RequestUriBuilder CreateCreateRequestUri(string scope, string diagnosticsResourceName, SelfHelpDiagnosticData data)
-        {
-            var uri = new RawRequestUriBuilder();
+            RawRequestUriBuilder uri = new RawRequestUriBuilder();
             uri.Reset(_endpoint);
             uri.AppendPath("/", false);
             uri.AppendPath(scope, false);
             uri.AppendPath("/providers/Microsoft.Help/diagnostics/", false);
             uri.AppendPath(diagnosticsResourceName, true);
             uri.AppendQuery("api-version", _apiVersion, true);
-            return uri;
+            HttpMessage message = Pipeline.CreateMessage();
+            Request request = message.Request;
+            request.Uri = uri;
+            request.Method = RequestMethod.Get;
+            request.Headers.SetValue("Accept", "application/json");
+            return message;
         }
 
-        internal HttpMessage CreateCreateRequest(string scope, string diagnosticsResourceName, SelfHelpDiagnosticData data)
+        internal HttpMessage CreateCreateRequest(string scope, string diagnosticsResourceName, RequestContent content, RequestContext context)
         {
-            var message = _pipeline.CreateMessage();
-            var request = message.Request;
-            request.Method = RequestMethod.Put;
-            var uri = new RawRequestUriBuilder();
+            RawRequestUriBuilder uri = new RawRequestUriBuilder();
             uri.Reset(_endpoint);
             uri.AppendPath("/", false);
             uri.AppendPath(scope, false);
             uri.AppendPath("/providers/Microsoft.Help/diagnostics/", false);
             uri.AppendPath(diagnosticsResourceName, true);
             uri.AppendQuery("api-version", _apiVersion, true);
+            HttpMessage message = Pipeline.CreateMessage();
+            Request request = message.Request;
             request.Uri = uri;
-            request.Headers.Add("Accept", "application/json");
-            request.Headers.Add("Content-Type", "application/json");
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(data, ModelSerializationExtensions.WireOptions);
-            request.Content = content;
-            _userAgent.Apply(message);
-            return message;
-        }
-
-        /// <summary> Creates a diagnostic for the specific resource using solutionId from discovery solutions. &lt;br/&gt;Diagnostics are powerful solutions that access product resources or other relevant data and provide the root cause of the issue and the steps to address the issue.&lt;br/&gt;&lt;br/&gt;. </summary>
-        /// <param name="scope"> The fully qualified Azure Resource manager identifier of the resource. </param>
-        /// <param name="diagnosticsResourceName"> Unique resource name for insight resources. </param>
-        /// <param name="data"> The required request body for this insightResource invocation. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="scope"/>, <paramref name="diagnosticsResourceName"/> or <paramref name="data"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="diagnosticsResourceName"/> is an empty string, and was expected to be non-empty. </exception>
-        public async Task<Response> CreateAsync(string scope, string diagnosticsResourceName, SelfHelpDiagnosticData data, CancellationToken cancellationToken = default)
-        {
-            Argument.AssertNotNull(scope, nameof(scope));
-            Argument.AssertNotNullOrEmpty(diagnosticsResourceName, nameof(diagnosticsResourceName));
-            Argument.AssertNotNull(data, nameof(data));
-
-            using var message = CreateCreateRequest(scope, diagnosticsResourceName, data);
-            await _pipeline.SendAsync(message, cancellationToken).ConfigureAwait(false);
-            switch (message.Response.Status)
-            {
-                case 200:
-                case 201:
-                    return message.Response;
-                default:
-                    throw new RequestFailedException(message.Response);
-            }
-        }
-
-        /// <summary> Creates a diagnostic for the specific resource using solutionId from discovery solutions. &lt;br/&gt;Diagnostics are powerful solutions that access product resources or other relevant data and provide the root cause of the issue and the steps to address the issue.&lt;br/&gt;&lt;br/&gt;. </summary>
-        /// <param name="scope"> The fully qualified Azure Resource manager identifier of the resource. </param>
-        /// <param name="diagnosticsResourceName"> Unique resource name for insight resources. </param>
-        /// <param name="data"> The required request body for this insightResource invocation. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="scope"/>, <paramref name="diagnosticsResourceName"/> or <paramref name="data"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="diagnosticsResourceName"/> is an empty string, and was expected to be non-empty. </exception>
-        public Response Create(string scope, string diagnosticsResourceName, SelfHelpDiagnosticData data, CancellationToken cancellationToken = default)
-        {
-            Argument.AssertNotNull(scope, nameof(scope));
-            Argument.AssertNotNullOrEmpty(diagnosticsResourceName, nameof(diagnosticsResourceName));
-            Argument.AssertNotNull(data, nameof(data));
-
-            using var message = CreateCreateRequest(scope, diagnosticsResourceName, data);
-            _pipeline.Send(message, cancellationToken);
-            switch (message.Response.Status)
+            request.Method = RequestMethod.Put;
+            if ("application/json" != null)
             {
-                case 200:
-                case 201:
-                    return message.Response;
-                default:
-                    throw new RequestFailedException(message.Response);
+                request.Headers.SetValue("Content-Type", "application/json");
             }
+            request.Headers.SetValue("Accept", "application/json");
+            request.Content = content;
+            return message;
         }
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/RestOperations/DiscoverySolutionNLPOperationGroupRestOperations.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/RestOperations/DiscoverySolutionNLPOperationGroupRestOperations.cs
index 1430a5a34f2b..404594470012 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/RestOperations/DiscoverySolutionNLPOperationGroupRestOperations.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/RestOperations/DiscoverySolutionNLPOperationGroupRestOperations.cs
@@ -6,107 +6,58 @@
 #nullable disable
 
 using System;
-using System.Text.Json;
-using System.Threading;
-using System.Threading.Tasks;
+using Azure;
 using Azure.Core;
 using Azure.Core.Pipeline;
-using Azure.ResourceManager.SelfHelp.Models;
 
 namespace Azure.ResourceManager.SelfHelp
 {
-    internal partial class DiscoverySolutionNLPOperationGroupRestOperations
+    internal partial class DiscoverySolutionNLPOperationGroup
     {
-        private readonly TelemetryDetails _userAgent;
-        private readonly HttpPipeline _pipeline;
         private readonly Uri _endpoint;
         private readonly string _apiVersion;
 
-        /// <summary> Initializes a new instance of DiscoverySolutionNLPOperationGroupRestOperations. </summary>
-        /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
-        /// <param name="applicationId"> The application id to use for user agent. </param>
-        /// <param name="endpoint"> Service host. </param>
-        /// <param name="apiVersion"> The API version to use for this operation. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="pipeline"/> or <paramref name="apiVersion"/> is null. </exception>
-        public DiscoverySolutionNLPOperationGroupRestOperations(HttpPipeline pipeline, string applicationId, Uri endpoint = null, string apiVersion = default)
+        /// <summary> Initializes a new instance of DiscoverySolutionNLPOperationGroup for mocking. </summary>
+        protected DiscoverySolutionNLPOperationGroup()
         {
-            _pipeline = pipeline ?? throw new ArgumentNullException(nameof(pipeline));
-            _endpoint = endpoint ?? new Uri("https://management.azure.com");
-            _apiVersion = apiVersion ?? "2024-03-01-preview";
-            _userAgent = new TelemetryDetails(GetType().Assembly, applicationId);
         }
 
-        internal RequestUriBuilder CreateDiscoverSolutionsNlpRequestUri(DiscoveryNlpContent content)
+        /// <summary> Initializes a new instance of DiscoverySolutionNLPOperationGroup. </summary>
+        /// <param name="clientDiagnostics"> The ClientDiagnostics is used to provide tracing support for the client library. </param>
+        /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
+        /// <param name="endpoint"> Service endpoint. </param>
+        /// <param name="apiVersion"></param>
+        internal DiscoverySolutionNLPOperationGroup(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, Uri endpoint, string apiVersion)
         {
-            var uri = new RawRequestUriBuilder();
-            uri.Reset(_endpoint);
-            uri.AppendPath("/providers/Microsoft.Help/discoverSolutions", false);
-            uri.AppendQuery("api-version", _apiVersion, true);
-            return uri;
+            ClientDiagnostics = clientDiagnostics;
+            _endpoint = endpoint;
+            Pipeline = pipeline;
+            _apiVersion = apiVersion;
         }
 
-        internal HttpMessage CreateDiscoverSolutionsNlpRequest(DiscoveryNlpContent content)
+        /// <summary> The HTTP pipeline for sending and receiving REST requests and responses. </summary>
+        public virtual HttpPipeline Pipeline { get; }
+
+        /// <summary> The ClientDiagnostics is used to provide tracing support for the client library. </summary>
+        internal ClientDiagnostics ClientDiagnostics { get; }
+
+        internal HttpMessage CreateDiscoverSolutionsNlpRequest(RequestContent content, RequestContext context)
         {
-            var message = _pipeline.CreateMessage();
-            var request = message.Request;
-            request.Method = RequestMethod.Post;
-            var uri = new RawRequestUriBuilder();
+            RawRequestUriBuilder uri = new RawRequestUriBuilder();
             uri.Reset(_endpoint);
             uri.AppendPath("/providers/Microsoft.Help/discoverSolutions", false);
             uri.AppendQuery("api-version", _apiVersion, true);
+            HttpMessage message = Pipeline.CreateMessage();
+            Request request = message.Request;
             request.Uri = uri;
-            request.Headers.Add("Accept", "application/json");
-            if (content != null)
+            request.Method = RequestMethod.Post;
+            if ("application/json" != null)
             {
-                request.Headers.Add("Content-Type", "application/json");
-                var content0 = new Utf8JsonRequestContent();
-                content0.JsonWriter.WriteObjectValue(content, ModelSerializationExtensions.WireOptions);
-                request.Content = content0;
+                request.Headers.SetValue("Content-Type", "application/json");
             }
-            _userAgent.Apply(message);
+            request.Headers.SetValue("Accept", "application/json");
+            request.Content = content;
             return message;
         }
-
-        /// <summary> Search for relevant Azure Diagnostics, Solutions and Troubleshooters using a natural language issue summary. </summary>
-        /// <param name="content"> The request body. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        public async Task<Response<DiscoveryNlpResult>> DiscoverSolutionsNlpAsync(DiscoveryNlpContent content = null, CancellationToken cancellationToken = default)
-        {
-            using var message = CreateDiscoverSolutionsNlpRequest(content);
-            await _pipeline.SendAsync(message, cancellationToken).ConfigureAwait(false);
-            switch (message.Response.Status)
-            {
-                case 200:
-                    {
-                        DiscoveryNlpResult value = default;
-                        using var document = await JsonDocument.ParseAsync(message.Response.ContentStream, ModelSerializationExtensions.JsonDocumentOptions, cancellationToken).ConfigureAwait(false);
-                        value = DiscoveryNlpResult.DeserializeDiscoveryNlpResult(document.RootElement);
-                        return Response.FromValue(value, message.Response);
-                    }
-                default:
-                    throw new RequestFailedException(message.Response);
-            }
-        }
-
-        /// <summary> Search for relevant Azure Diagnostics, Solutions and Troubleshooters using a natural language issue summary. </summary>
-        /// <param name="content"> The request body. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        public Response<DiscoveryNlpResult> DiscoverSolutionsNlp(DiscoveryNlpContent content = null, CancellationToken cancellationToken = default)
-        {
-            using var message = CreateDiscoverSolutionsNlpRequest(content);
-            _pipeline.Send(message, cancellationToken);
-            switch (message.Response.Status)
-            {
-                case 200:
-                    {
-                        DiscoveryNlpResult value = default;
-                        using var document = JsonDocument.Parse(message.Response.ContentStream, ModelSerializationExtensions.JsonDocumentOptions);
-                        value = DiscoveryNlpResult.DeserializeDiscoveryNlpResult(document.RootElement);
-                        return Response.FromValue(value, message.Response);
-                    }
-                default:
-                    throw new RequestFailedException(message.Response);
-            }
-        }
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/RestOperations/DiscoverySolutionNLPRestOperations.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/RestOperations/DiscoverySolutionNLPRestOperations.cs
index cbadbbb5ecbe..8d41eeb2deb0 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/RestOperations/DiscoverySolutionNLPRestOperations.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/RestOperations/DiscoverySolutionNLPRestOperations.cs
@@ -6,121 +6,60 @@
 #nullable disable
 
 using System;
-using System.Text.Json;
-using System.Threading;
-using System.Threading.Tasks;
+using Azure;
 using Azure.Core;
 using Azure.Core.Pipeline;
-using Azure.ResourceManager.SelfHelp.Models;
 
 namespace Azure.ResourceManager.SelfHelp
 {
-    internal partial class DiscoverySolutionNLPRestOperations
+    internal partial class DiscoverySolutionNLP
     {
-        private readonly TelemetryDetails _userAgent;
-        private readonly HttpPipeline _pipeline;
         private readonly Uri _endpoint;
         private readonly string _apiVersion;
 
-        /// <summary> Initializes a new instance of DiscoverySolutionNLPRestOperations. </summary>
-        /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
-        /// <param name="applicationId"> The application id to use for user agent. </param>
-        /// <param name="endpoint"> Service host. </param>
-        /// <param name="apiVersion"> The API version to use for this operation. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="pipeline"/> or <paramref name="apiVersion"/> is null. </exception>
-        public DiscoverySolutionNLPRestOperations(HttpPipeline pipeline, string applicationId, Uri endpoint = null, string apiVersion = default)
+        /// <summary> Initializes a new instance of DiscoverySolutionNLP for mocking. </summary>
+        protected DiscoverySolutionNLP()
         {
-            _pipeline = pipeline ?? throw new ArgumentNullException(nameof(pipeline));
-            _endpoint = endpoint ?? new Uri("https://management.azure.com");
-            _apiVersion = apiVersion ?? "2024-03-01-preview";
-            _userAgent = new TelemetryDetails(GetType().Assembly, applicationId);
         }
 
-        internal RequestUriBuilder CreateDiscoverSolutionsNlpRequestUri(string subscriptionId, DiscoveryNlpContent content)
+        /// <summary> Initializes a new instance of DiscoverySolutionNLP. </summary>
+        /// <param name="clientDiagnostics"> The ClientDiagnostics is used to provide tracing support for the client library. </param>
+        /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
+        /// <param name="endpoint"> Service endpoint. </param>
+        /// <param name="apiVersion"></param>
+        internal DiscoverySolutionNLP(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, Uri endpoint, string apiVersion)
         {
-            var uri = new RawRequestUriBuilder();
-            uri.Reset(_endpoint);
-            uri.AppendPath("/subscriptions/", false);
-            uri.AppendPath(subscriptionId, true);
-            uri.AppendPath("/providers/Microsoft.Help/discoverSolutions", false);
-            uri.AppendQuery("api-version", _apiVersion, true);
-            return uri;
+            ClientDiagnostics = clientDiagnostics;
+            _endpoint = endpoint;
+            Pipeline = pipeline;
+            _apiVersion = apiVersion;
         }
 
-        internal HttpMessage CreateDiscoverSolutionsNlpRequest(string subscriptionId, DiscoveryNlpContent content)
+        /// <summary> The HTTP pipeline for sending and receiving REST requests and responses. </summary>
+        public virtual HttpPipeline Pipeline { get; }
+
+        /// <summary> The ClientDiagnostics is used to provide tracing support for the client library. </summary>
+        internal ClientDiagnostics ClientDiagnostics { get; }
+
+        internal HttpMessage CreateDiscoverSolutionsNlpRequest(Guid subscriptionId, RequestContent content, RequestContext context)
         {
-            var message = _pipeline.CreateMessage();
-            var request = message.Request;
-            request.Method = RequestMethod.Post;
-            var uri = new RawRequestUriBuilder();
+            RawRequestUriBuilder uri = new RawRequestUriBuilder();
             uri.Reset(_endpoint);
             uri.AppendPath("/subscriptions/", false);
-            uri.AppendPath(subscriptionId, true);
+            uri.AppendPath(subscriptionId.ToString(), true);
             uri.AppendPath("/providers/Microsoft.Help/discoverSolutions", false);
             uri.AppendQuery("api-version", _apiVersion, true);
+            HttpMessage message = Pipeline.CreateMessage();
+            Request request = message.Request;
             request.Uri = uri;
-            request.Headers.Add("Accept", "application/json");
-            if (content != null)
+            request.Method = RequestMethod.Post;
+            if ("application/json" != null)
             {
-                request.Headers.Add("Content-Type", "application/json");
-                var content0 = new Utf8JsonRequestContent();
-                content0.JsonWriter.WriteObjectValue(content, ModelSerializationExtensions.WireOptions);
-                request.Content = content0;
+                request.Headers.SetValue("Content-Type", "application/json");
             }
-            _userAgent.Apply(message);
+            request.Headers.SetValue("Accept", "application/json");
+            request.Content = content;
             return message;
         }
-
-        /// <summary> Search for relevant Azure Diagnostics, Solutions and Troubleshooters using a natural language issue summary and subscription. </summary>
-        /// <param name="subscriptionId"> The ID of the target subscription. The value must be an UUID. </param>
-        /// <param name="content"> The request body. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="subscriptionId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="subscriptionId"/> is an empty string, and was expected to be non-empty. </exception>
-        public async Task<Response<DiscoveryNlpResult>> DiscoverSolutionsNlpAsync(string subscriptionId, DiscoveryNlpContent content = null, CancellationToken cancellationToken = default)
-        {
-            Argument.AssertNotNullOrEmpty(subscriptionId, nameof(subscriptionId));
-
-            using var message = CreateDiscoverSolutionsNlpRequest(subscriptionId, content);
-            await _pipeline.SendAsync(message, cancellationToken).ConfigureAwait(false);
-            switch (message.Response.Status)
-            {
-                case 200:
-                    {
-                        DiscoveryNlpResult value = default;
-                        using var document = await JsonDocument.ParseAsync(message.Response.ContentStream, ModelSerializationExtensions.JsonDocumentOptions, cancellationToken).ConfigureAwait(false);
-                        value = DiscoveryNlpResult.DeserializeDiscoveryNlpResult(document.RootElement);
-                        return Response.FromValue(value, message.Response);
-                    }
-                default:
-                    throw new RequestFailedException(message.Response);
-            }
-        }
-
-        /// <summary> Search for relevant Azure Diagnostics, Solutions and Troubleshooters using a natural language issue summary and subscription. </summary>
-        /// <param name="subscriptionId"> The ID of the target subscription. The value must be an UUID. </param>
-        /// <param name="content"> The request body. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="subscriptionId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="subscriptionId"/> is an empty string, and was expected to be non-empty. </exception>
-        public Response<DiscoveryNlpResult> DiscoverSolutionsNlp(string subscriptionId, DiscoveryNlpContent content = null, CancellationToken cancellationToken = default)
-        {
-            Argument.AssertNotNullOrEmpty(subscriptionId, nameof(subscriptionId));
-
-            using var message = CreateDiscoverSolutionsNlpRequest(subscriptionId, content);
-            _pipeline.Send(message, cancellationToken);
-            switch (message.Response.Status)
-            {
-                case 200:
-                    {
-                        DiscoveryNlpResult value = default;
-                        using var document = JsonDocument.Parse(message.Response.ContentStream, ModelSerializationExtensions.JsonDocumentOptions);
-                        value = DiscoveryNlpResult.DeserializeDiscoveryNlpResult(document.RootElement);
-                        return Response.FromValue(value, message.Response);
-                    }
-                default:
-                    throw new RequestFailedException(message.Response);
-            }
-        }
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/RestOperations/DiscoverySolutionRestOperations.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/RestOperations/DiscoverySolutionRestOperations.cs
index 5e2795439ee9..37ca241e0f26 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/RestOperations/DiscoverySolutionRestOperations.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/RestOperations/DiscoverySolutionRestOperations.cs
@@ -6,59 +6,44 @@
 #nullable disable
 
 using System;
-using System.Text.Json;
-using System.Threading;
-using System.Threading.Tasks;
+using Azure;
 using Azure.Core;
 using Azure.Core.Pipeline;
-using Azure.ResourceManager.SelfHelp.Models;
 
 namespace Azure.ResourceManager.SelfHelp
 {
-    internal partial class DiscoverySolutionRestOperations
+    internal partial class DiscoverySolution
     {
-        private readonly TelemetryDetails _userAgent;
-        private readonly HttpPipeline _pipeline;
         private readonly Uri _endpoint;
         private readonly string _apiVersion;
 
-        /// <summary> Initializes a new instance of DiscoverySolutionRestOperations. </summary>
-        /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
-        /// <param name="applicationId"> The application id to use for user agent. </param>
-        /// <param name="endpoint"> Service host. </param>
-        /// <param name="apiVersion"> The API version to use for this operation. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="pipeline"/> or <paramref name="apiVersion"/> is null. </exception>
-        public DiscoverySolutionRestOperations(HttpPipeline pipeline, string applicationId, Uri endpoint = null, string apiVersion = default)
+        /// <summary> Initializes a new instance of DiscoverySolution for mocking. </summary>
+        protected DiscoverySolution()
         {
-            _pipeline = pipeline ?? throw new ArgumentNullException(nameof(pipeline));
-            _endpoint = endpoint ?? new Uri("https://management.azure.com");
-            _apiVersion = apiVersion ?? "2024-03-01-preview";
-            _userAgent = new TelemetryDetails(GetType().Assembly, applicationId);
         }
 
-        internal RequestUriBuilder CreateDiscoverSolutionsRequestUri(string filter, string skiptoken)
+        /// <summary> Initializes a new instance of DiscoverySolution. </summary>
+        /// <param name="clientDiagnostics"> The ClientDiagnostics is used to provide tracing support for the client library. </param>
+        /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
+        /// <param name="endpoint"> Service endpoint. </param>
+        /// <param name="apiVersion"></param>
+        internal DiscoverySolution(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, Uri endpoint, string apiVersion)
         {
-            var uri = new RawRequestUriBuilder();
-            uri.Reset(_endpoint);
-            uri.AppendPath("/providers/Microsoft.Help/discoverySolutions", false);
-            uri.AppendQuery("api-version", _apiVersion, true);
-            if (filter != null)
-            {
-                uri.AppendQuery("$filter", filter, true);
-            }
-            if (skiptoken != null)
-            {
-                uri.AppendQuery("$skiptoken", skiptoken, true);
-            }
-            return uri;
+            ClientDiagnostics = clientDiagnostics;
+            _endpoint = endpoint;
+            Pipeline = pipeline;
+            _apiVersion = apiVersion;
         }
 
-        internal HttpMessage CreateDiscoverSolutionsRequest(string filter, string skiptoken)
+        /// <summary> The HTTP pipeline for sending and receiving REST requests and responses. </summary>
+        public virtual HttpPipeline Pipeline { get; }
+
+        /// <summary> The ClientDiagnostics is used to provide tracing support for the client library. </summary>
+        internal ClientDiagnostics ClientDiagnostics { get; }
+
+        internal HttpMessage CreateDiscoverSolutionsRequest(string filter, string skiptoken, RequestContext context)
         {
-            var message = _pipeline.CreateMessage();
-            var request = message.Request;
-            request.Method = RequestMethod.Get;
-            var uri = new RawRequestUriBuilder();
+            RawRequestUriBuilder uri = new RawRequestUriBuilder();
             uri.Reset(_endpoint);
             uri.AppendPath("/providers/Microsoft.Help/discoverySolutions", false);
             uri.AppendQuery("api-version", _apiVersion, true);
@@ -70,128 +55,24 @@ internal HttpMessage CreateDiscoverSolutionsRequest(string filter, string skipto
             {
                 uri.AppendQuery("$skiptoken", skiptoken, true);
             }
+            HttpMessage message = Pipeline.CreateMessage();
+            Request request = message.Request;
             request.Uri = uri;
-            request.Headers.Add("Accept", "application/json");
-            _userAgent.Apply(message);
+            request.Method = RequestMethod.Get;
+            request.Headers.SetValue("Accept", "application/json");
             return message;
         }
 
-        /// <summary> Lists the relevant Azure Diagnostics, Solutions and Troubleshooters using [problemClassification API](https://learn.microsoft.com/rest/api/support/problem-classifications/list?tabs=HTTP)) AND  resourceUri or resourceType.&lt;br/&gt; Discovery Solutions is the initial entry point within Help API, which identifies relevant Azure diagnostics and solutions. &lt;br/&gt;&lt;br/&gt; Required Input :  problemClassificationId (Use the [problemClassification API](https://learn.microsoft.com/rest/api/support/problem-classifications/list?tabs=HTTP)) &lt;br/&gt;Optional input: resourceUri OR resource Type &lt;br/&gt;&lt;br/&gt; &lt;b&gt;Note: &lt;/b&gt;  ‘requiredInputs’ from Discovery solutions response must be passed via ‘additionalParameters’ as an input to Diagnostics and Solutions API. </summary>
-        /// <param name="filter"> 'ProblemClassificationId' is a mandatory filter to get solutions ids. It also supports optional 'ResourceType' and 'SolutionType' filters. The [$filter](https://learn.microsoft.com/en-us/odata/webapi/first-odata-api#filter) supports only 'and', 'or' and 'eq' operators. Example: $filter=ProblemClassificationId eq '1ddda5b4-cf6c-4d4f-91ad-bc38ab0e811e'. </param>
-        /// <param name="skiptoken"> Skiptoken is only used if a previous operation returned a partial result. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        public async Task<Response<SelfHelpDiscoverySolutionResult>> DiscoverSolutionsAsync(string filter = null, string skiptoken = null, CancellationToken cancellationToken = default)
-        {
-            using var message = CreateDiscoverSolutionsRequest(filter, skiptoken);
-            await _pipeline.SendAsync(message, cancellationToken).ConfigureAwait(false);
-            switch (message.Response.Status)
-            {
-                case 200:
-                    {
-                        SelfHelpDiscoverySolutionResult value = default;
-                        using var document = await JsonDocument.ParseAsync(message.Response.ContentStream, ModelSerializationExtensions.JsonDocumentOptions, cancellationToken).ConfigureAwait(false);
-                        value = SelfHelpDiscoverySolutionResult.DeserializeSelfHelpDiscoverySolutionResult(document.RootElement);
-                        return Response.FromValue(value, message.Response);
-                    }
-                default:
-                    throw new RequestFailedException(message.Response);
-            }
-        }
-
-        /// <summary> Lists the relevant Azure Diagnostics, Solutions and Troubleshooters using [problemClassification API](https://learn.microsoft.com/rest/api/support/problem-classifications/list?tabs=HTTP)) AND  resourceUri or resourceType.&lt;br/&gt; Discovery Solutions is the initial entry point within Help API, which identifies relevant Azure diagnostics and solutions. &lt;br/&gt;&lt;br/&gt; Required Input :  problemClassificationId (Use the [problemClassification API](https://learn.microsoft.com/rest/api/support/problem-classifications/list?tabs=HTTP)) &lt;br/&gt;Optional input: resourceUri OR resource Type &lt;br/&gt;&lt;br/&gt; &lt;b&gt;Note: &lt;/b&gt;  ‘requiredInputs’ from Discovery solutions response must be passed via ‘additionalParameters’ as an input to Diagnostics and Solutions API. </summary>
-        /// <param name="filter"> 'ProblemClassificationId' is a mandatory filter to get solutions ids. It also supports optional 'ResourceType' and 'SolutionType' filters. The [$filter](https://learn.microsoft.com/en-us/odata/webapi/first-odata-api#filter) supports only 'and', 'or' and 'eq' operators. Example: $filter=ProblemClassificationId eq '1ddda5b4-cf6c-4d4f-91ad-bc38ab0e811e'. </param>
-        /// <param name="skiptoken"> Skiptoken is only used if a previous operation returned a partial result. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        public Response<SelfHelpDiscoverySolutionResult> DiscoverSolutions(string filter = null, string skiptoken = null, CancellationToken cancellationToken = default)
-        {
-            using var message = CreateDiscoverSolutionsRequest(filter, skiptoken);
-            _pipeline.Send(message, cancellationToken);
-            switch (message.Response.Status)
-            {
-                case 200:
-                    {
-                        SelfHelpDiscoverySolutionResult value = default;
-                        using var document = JsonDocument.Parse(message.Response.ContentStream, ModelSerializationExtensions.JsonDocumentOptions);
-                        value = SelfHelpDiscoverySolutionResult.DeserializeSelfHelpDiscoverySolutionResult(document.RootElement);
-                        return Response.FromValue(value, message.Response);
-                    }
-                default:
-                    throw new RequestFailedException(message.Response);
-            }
-        }
-
-        internal RequestUriBuilder CreateDiscoverSolutionsNextPageRequestUri(string nextLink, string filter, string skiptoken)
-        {
-            var uri = new RawRequestUriBuilder();
-            uri.Reset(_endpoint);
-            uri.AppendRawNextLink(nextLink, false);
-            return uri;
-        }
-
-        internal HttpMessage CreateDiscoverSolutionsNextPageRequest(string nextLink, string filter, string skiptoken)
+        internal HttpMessage CreateNextDiscoverSolutionsRequest(Uri nextPage, string filter, string skiptoken, RequestContext context)
         {
-            var message = _pipeline.CreateMessage();
-            var request = message.Request;
-            request.Method = RequestMethod.Get;
-            var uri = new RawRequestUriBuilder();
-            uri.Reset(_endpoint);
-            uri.AppendRawNextLink(nextLink, false);
+            RawRequestUriBuilder uri = new RawRequestUriBuilder();
+            uri.Reset(nextPage);
+            HttpMessage message = Pipeline.CreateMessage();
+            Request request = message.Request;
             request.Uri = uri;
-            request.Headers.Add("Accept", "application/json");
-            _userAgent.Apply(message);
+            request.Method = RequestMethod.Get;
+            request.Headers.SetValue("Accept", "application/json");
             return message;
         }
-
-        /// <summary> Lists the relevant Azure Diagnostics, Solutions and Troubleshooters using [problemClassification API](https://learn.microsoft.com/rest/api/support/problem-classifications/list?tabs=HTTP)) AND  resourceUri or resourceType.&lt;br/&gt; Discovery Solutions is the initial entry point within Help API, which identifies relevant Azure diagnostics and solutions. &lt;br/&gt;&lt;br/&gt; Required Input :  problemClassificationId (Use the [problemClassification API](https://learn.microsoft.com/rest/api/support/problem-classifications/list?tabs=HTTP)) &lt;br/&gt;Optional input: resourceUri OR resource Type &lt;br/&gt;&lt;br/&gt; &lt;b&gt;Note: &lt;/b&gt;  ‘requiredInputs’ from Discovery solutions response must be passed via ‘additionalParameters’ as an input to Diagnostics and Solutions API. </summary>
-        /// <param name="nextLink"> The URL to the next page of results. </param>
-        /// <param name="filter"> 'ProblemClassificationId' is a mandatory filter to get solutions ids. It also supports optional 'ResourceType' and 'SolutionType' filters. The [$filter](https://learn.microsoft.com/en-us/odata/webapi/first-odata-api#filter) supports only 'and', 'or' and 'eq' operators. Example: $filter=ProblemClassificationId eq '1ddda5b4-cf6c-4d4f-91ad-bc38ab0e811e'. </param>
-        /// <param name="skiptoken"> Skiptoken is only used if a previous operation returned a partial result. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="nextLink"/> is null. </exception>
-        public async Task<Response<SelfHelpDiscoverySolutionResult>> DiscoverSolutionsNextPageAsync(string nextLink, string filter = null, string skiptoken = null, CancellationToken cancellationToken = default)
-        {
-            Argument.AssertNotNull(nextLink, nameof(nextLink));
-
-            using var message = CreateDiscoverSolutionsNextPageRequest(nextLink, filter, skiptoken);
-            await _pipeline.SendAsync(message, cancellationToken).ConfigureAwait(false);
-            switch (message.Response.Status)
-            {
-                case 200:
-                    {
-                        SelfHelpDiscoverySolutionResult value = default;
-                        using var document = await JsonDocument.ParseAsync(message.Response.ContentStream, ModelSerializationExtensions.JsonDocumentOptions, cancellationToken).ConfigureAwait(false);
-                        value = SelfHelpDiscoverySolutionResult.DeserializeSelfHelpDiscoverySolutionResult(document.RootElement);
-                        return Response.FromValue(value, message.Response);
-                    }
-                default:
-                    throw new RequestFailedException(message.Response);
-            }
-        }
-
-        /// <summary> Lists the relevant Azure Diagnostics, Solutions and Troubleshooters using [problemClassification API](https://learn.microsoft.com/rest/api/support/problem-classifications/list?tabs=HTTP)) AND  resourceUri or resourceType.&lt;br/&gt; Discovery Solutions is the initial entry point within Help API, which identifies relevant Azure diagnostics and solutions. &lt;br/&gt;&lt;br/&gt; Required Input :  problemClassificationId (Use the [problemClassification API](https://learn.microsoft.com/rest/api/support/problem-classifications/list?tabs=HTTP)) &lt;br/&gt;Optional input: resourceUri OR resource Type &lt;br/&gt;&lt;br/&gt; &lt;b&gt;Note: &lt;/b&gt;  ‘requiredInputs’ from Discovery solutions response must be passed via ‘additionalParameters’ as an input to Diagnostics and Solutions API. </summary>
-        /// <param name="nextLink"> The URL to the next page of results. </param>
-        /// <param name="filter"> 'ProblemClassificationId' is a mandatory filter to get solutions ids. It also supports optional 'ResourceType' and 'SolutionType' filters. The [$filter](https://learn.microsoft.com/en-us/odata/webapi/first-odata-api#filter) supports only 'and', 'or' and 'eq' operators. Example: $filter=ProblemClassificationId eq '1ddda5b4-cf6c-4d4f-91ad-bc38ab0e811e'. </param>
-        /// <param name="skiptoken"> Skiptoken is only used if a previous operation returned a partial result. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="nextLink"/> is null. </exception>
-        public Response<SelfHelpDiscoverySolutionResult> DiscoverSolutionsNextPage(string nextLink, string filter = null, string skiptoken = null, CancellationToken cancellationToken = default)
-        {
-            Argument.AssertNotNull(nextLink, nameof(nextLink));
-
-            using var message = CreateDiscoverSolutionsNextPageRequest(nextLink, filter, skiptoken);
-            _pipeline.Send(message, cancellationToken);
-            switch (message.Response.Status)
-            {
-                case 200:
-                    {
-                        SelfHelpDiscoverySolutionResult value = default;
-                        using var document = JsonDocument.Parse(message.Response.ContentStream, ModelSerializationExtensions.JsonDocumentOptions);
-                        value = SelfHelpDiscoverySolutionResult.DeserializeSelfHelpDiscoverySolutionResult(document.RootElement);
-                        return Response.FromValue(value, message.Response);
-                    }
-                default:
-                    throw new RequestFailedException(message.Response);
-            }
-        }
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/RestOperations/SimplifiedSolutionsResourcesRestOperations.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/RestOperations/SimplifiedSolutionsResourcesRestOperations.cs
index 8dac7f1f2da8..04aa21e17873 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/RestOperations/SimplifiedSolutionsResourcesRestOperations.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/RestOperations/SimplifiedSolutionsResourcesRestOperations.cs
@@ -6,205 +6,78 @@
 #nullable disable
 
 using System;
-using System.Text.Json;
-using System.Threading;
-using System.Threading.Tasks;
+using Azure;
 using Azure.Core;
 using Azure.Core.Pipeline;
 
 namespace Azure.ResourceManager.SelfHelp
 {
-    internal partial class SimplifiedSolutionsResourcesRestOperations
+    internal partial class SimplifiedSolutionsResources
     {
-        private readonly TelemetryDetails _userAgent;
-        private readonly HttpPipeline _pipeline;
         private readonly Uri _endpoint;
         private readonly string _apiVersion;
 
-        /// <summary> Initializes a new instance of SimplifiedSolutionsResourcesRestOperations. </summary>
-        /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
-        /// <param name="applicationId"> The application id to use for user agent. </param>
-        /// <param name="endpoint"> Service host. </param>
-        /// <param name="apiVersion"> The API version to use for this operation. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="pipeline"/> or <paramref name="apiVersion"/> is null. </exception>
-        public SimplifiedSolutionsResourcesRestOperations(HttpPipeline pipeline, string applicationId, Uri endpoint = null, string apiVersion = default)
+        /// <summary> Initializes a new instance of SimplifiedSolutionsResources for mocking. </summary>
+        protected SimplifiedSolutionsResources()
         {
-            _pipeline = pipeline ?? throw new ArgumentNullException(nameof(pipeline));
-            _endpoint = endpoint ?? new Uri("https://management.azure.com");
-            _apiVersion = apiVersion ?? "2024-03-01-preview";
-            _userAgent = new TelemetryDetails(GetType().Assembly, applicationId);
         }
 
-        internal RequestUriBuilder CreateGetRequestUri(string scope, string simplifiedSolutionsResourceName)
+        /// <summary> Initializes a new instance of SimplifiedSolutionsResources. </summary>
+        /// <param name="clientDiagnostics"> The ClientDiagnostics is used to provide tracing support for the client library. </param>
+        /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
+        /// <param name="endpoint"> Service endpoint. </param>
+        /// <param name="apiVersion"></param>
+        internal SimplifiedSolutionsResources(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, Uri endpoint, string apiVersion)
         {
-            var uri = new RawRequestUriBuilder();
-            uri.Reset(_endpoint);
-            uri.AppendPath("/", false);
-            uri.AppendPath(scope, false);
-            uri.AppendPath("/providers/Microsoft.Help/simplifiedSolutions/", false);
-            uri.AppendPath(simplifiedSolutionsResourceName, true);
-            uri.AppendQuery("api-version", _apiVersion, true);
-            return uri;
+            ClientDiagnostics = clientDiagnostics;
+            _endpoint = endpoint;
+            Pipeline = pipeline;
+            _apiVersion = apiVersion;
         }
 
-        internal HttpMessage CreateGetRequest(string scope, string simplifiedSolutionsResourceName)
-        {
-            var message = _pipeline.CreateMessage();
-            var request = message.Request;
-            request.Method = RequestMethod.Get;
-            var uri = new RawRequestUriBuilder();
-            uri.Reset(_endpoint);
-            uri.AppendPath("/", false);
-            uri.AppendPath(scope, false);
-            uri.AppendPath("/providers/Microsoft.Help/simplifiedSolutions/", false);
-            uri.AppendPath(simplifiedSolutionsResourceName, true);
-            uri.AppendQuery("api-version", _apiVersion, true);
-            request.Uri = uri;
-            request.Headers.Add("Accept", "application/json");
-            _userAgent.Apply(message);
-            return message;
-        }
+        /// <summary> The HTTP pipeline for sending and receiving REST requests and responses. </summary>
+        public virtual HttpPipeline Pipeline { get; }
 
-        /// <summary> Get the simplified Solutions using the applicable solutionResourceName while creating the simplified Solutions. </summary>
-        /// <param name="scope"> The fully qualified Azure Resource manager identifier of the resource. </param>
-        /// <param name="simplifiedSolutionsResourceName"> Simplified Solutions Resource Name. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="scope"/> or <paramref name="simplifiedSolutionsResourceName"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="simplifiedSolutionsResourceName"/> is an empty string, and was expected to be non-empty. </exception>
-        public async Task<Response<SelfHelpSimplifiedSolutionData>> GetAsync(string scope, string simplifiedSolutionsResourceName, CancellationToken cancellationToken = default)
-        {
-            Argument.AssertNotNull(scope, nameof(scope));
-            Argument.AssertNotNullOrEmpty(simplifiedSolutionsResourceName, nameof(simplifiedSolutionsResourceName));
-
-            using var message = CreateGetRequest(scope, simplifiedSolutionsResourceName);
-            await _pipeline.SendAsync(message, cancellationToken).ConfigureAwait(false);
-            switch (message.Response.Status)
-            {
-                case 200:
-                    {
-                        SelfHelpSimplifiedSolutionData value = default;
-                        using var document = await JsonDocument.ParseAsync(message.Response.ContentStream, ModelSerializationExtensions.JsonDocumentOptions, cancellationToken).ConfigureAwait(false);
-                        value = SelfHelpSimplifiedSolutionData.DeserializeSelfHelpSimplifiedSolutionData(document.RootElement);
-                        return Response.FromValue(value, message.Response);
-                    }
-                case 404:
-                    return Response.FromValue((SelfHelpSimplifiedSolutionData)null, message.Response);
-                default:
-                    throw new RequestFailedException(message.Response);
-            }
-        }
+        /// <summary> The ClientDiagnostics is used to provide tracing support for the client library. </summary>
+        internal ClientDiagnostics ClientDiagnostics { get; }
 
-        /// <summary> Get the simplified Solutions using the applicable solutionResourceName while creating the simplified Solutions. </summary>
-        /// <param name="scope"> The fully qualified Azure Resource manager identifier of the resource. </param>
-        /// <param name="simplifiedSolutionsResourceName"> Simplified Solutions Resource Name. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="scope"/> or <paramref name="simplifiedSolutionsResourceName"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="simplifiedSolutionsResourceName"/> is an empty string, and was expected to be non-empty. </exception>
-        public Response<SelfHelpSimplifiedSolutionData> Get(string scope, string simplifiedSolutionsResourceName, CancellationToken cancellationToken = default)
+        internal HttpMessage CreateGetRequest(string scope, string simplifiedSolutionsResourceName, RequestContext context)
         {
-            Argument.AssertNotNull(scope, nameof(scope));
-            Argument.AssertNotNullOrEmpty(simplifiedSolutionsResourceName, nameof(simplifiedSolutionsResourceName));
-
-            using var message = CreateGetRequest(scope, simplifiedSolutionsResourceName);
-            _pipeline.Send(message, cancellationToken);
-            switch (message.Response.Status)
-            {
-                case 200:
-                    {
-                        SelfHelpSimplifiedSolutionData value = default;
-                        using var document = JsonDocument.Parse(message.Response.ContentStream, ModelSerializationExtensions.JsonDocumentOptions);
-                        value = SelfHelpSimplifiedSolutionData.DeserializeSelfHelpSimplifiedSolutionData(document.RootElement);
-                        return Response.FromValue(value, message.Response);
-                    }
-                case 404:
-                    return Response.FromValue((SelfHelpSimplifiedSolutionData)null, message.Response);
-                default:
-                    throw new RequestFailedException(message.Response);
-            }
-        }
-
-        internal RequestUriBuilder CreateCreateRequestUri(string scope, string simplifiedSolutionsResourceName, SelfHelpSimplifiedSolutionData data)
-        {
-            var uri = new RawRequestUriBuilder();
+            RawRequestUriBuilder uri = new RawRequestUriBuilder();
             uri.Reset(_endpoint);
             uri.AppendPath("/", false);
             uri.AppendPath(scope, false);
             uri.AppendPath("/providers/Microsoft.Help/simplifiedSolutions/", false);
             uri.AppendPath(simplifiedSolutionsResourceName, true);
             uri.AppendQuery("api-version", _apiVersion, true);
-            return uri;
+            HttpMessage message = Pipeline.CreateMessage();
+            Request request = message.Request;
+            request.Uri = uri;
+            request.Method = RequestMethod.Get;
+            request.Headers.SetValue("Accept", "application/json");
+            return message;
         }
 
-        internal HttpMessage CreateCreateRequest(string scope, string simplifiedSolutionsResourceName, SelfHelpSimplifiedSolutionData data)
+        internal HttpMessage CreateCreateRequest(string scope, string simplifiedSolutionsResourceName, RequestContent content, RequestContext context)
         {
-            var message = _pipeline.CreateMessage();
-            var request = message.Request;
-            request.Method = RequestMethod.Put;
-            var uri = new RawRequestUriBuilder();
+            RawRequestUriBuilder uri = new RawRequestUriBuilder();
             uri.Reset(_endpoint);
             uri.AppendPath("/", false);
             uri.AppendPath(scope, false);
             uri.AppendPath("/providers/Microsoft.Help/simplifiedSolutions/", false);
             uri.AppendPath(simplifiedSolutionsResourceName, true);
             uri.AppendQuery("api-version", _apiVersion, true);
+            HttpMessage message = Pipeline.CreateMessage();
+            Request request = message.Request;
             request.Uri = uri;
-            request.Headers.Add("Accept", "application/json");
-            request.Headers.Add("Content-Type", "application/json");
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(data, ModelSerializationExtensions.WireOptions);
-            request.Content = content;
-            _userAgent.Apply(message);
-            return message;
-        }
-
-        /// <summary> Creates Simplified Solutions for an Azure subscription using 'solutionId' from Discovery Solutions as the input. &lt;br/&gt;&lt;br/&gt; Simplified Solutions API makes the consumption of solutions APIs easier while still providing access to the same powerful solutions rendered in Solutions API. With Simplified Solutions, users don't have to worry about stitching together the article using replacement maps and can use the content in the API response to directly render as HTML content.&lt;br/&gt;. </summary>
-        /// <param name="scope"> The fully qualified Azure Resource manager identifier of the resource. </param>
-        /// <param name="simplifiedSolutionsResourceName"> Simplified Solutions Resource Name. </param>
-        /// <param name="data"> The required request body for simplified Solutions resource creation. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="scope"/>, <paramref name="simplifiedSolutionsResourceName"/> or <paramref name="data"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="simplifiedSolutionsResourceName"/> is an empty string, and was expected to be non-empty. </exception>
-        public async Task<Response> CreateAsync(string scope, string simplifiedSolutionsResourceName, SelfHelpSimplifiedSolutionData data, CancellationToken cancellationToken = default)
-        {
-            Argument.AssertNotNull(scope, nameof(scope));
-            Argument.AssertNotNullOrEmpty(simplifiedSolutionsResourceName, nameof(simplifiedSolutionsResourceName));
-            Argument.AssertNotNull(data, nameof(data));
-
-            using var message = CreateCreateRequest(scope, simplifiedSolutionsResourceName, data);
-            await _pipeline.SendAsync(message, cancellationToken).ConfigureAwait(false);
-            switch (message.Response.Status)
-            {
-                case 200:
-                case 201:
-                    return message.Response;
-                default:
-                    throw new RequestFailedException(message.Response);
-            }
-        }
-
-        /// <summary> Creates Simplified Solutions for an Azure subscription using 'solutionId' from Discovery Solutions as the input. &lt;br/&gt;&lt;br/&gt; Simplified Solutions API makes the consumption of solutions APIs easier while still providing access to the same powerful solutions rendered in Solutions API. With Simplified Solutions, users don't have to worry about stitching together the article using replacement maps and can use the content in the API response to directly render as HTML content.&lt;br/&gt;. </summary>
-        /// <param name="scope"> The fully qualified Azure Resource manager identifier of the resource. </param>
-        /// <param name="simplifiedSolutionsResourceName"> Simplified Solutions Resource Name. </param>
-        /// <param name="data"> The required request body for simplified Solutions resource creation. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="scope"/>, <paramref name="simplifiedSolutionsResourceName"/> or <paramref name="data"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="simplifiedSolutionsResourceName"/> is an empty string, and was expected to be non-empty. </exception>
-        public Response Create(string scope, string simplifiedSolutionsResourceName, SelfHelpSimplifiedSolutionData data, CancellationToken cancellationToken = default)
-        {
-            Argument.AssertNotNull(scope, nameof(scope));
-            Argument.AssertNotNullOrEmpty(simplifiedSolutionsResourceName, nameof(simplifiedSolutionsResourceName));
-            Argument.AssertNotNull(data, nameof(data));
-
-            using var message = CreateCreateRequest(scope, simplifiedSolutionsResourceName, data);
-            _pipeline.Send(message, cancellationToken);
-            switch (message.Response.Status)
+            request.Method = RequestMethod.Put;
+            if ("application/json" != null)
             {
-                case 200:
-                case 201:
-                    return message.Response;
-                default:
-                    throw new RequestFailedException(message.Response);
+                request.Headers.SetValue("Content-Type", "application/json");
             }
+            request.Headers.SetValue("Accept", "application/json");
+            request.Content = content;
+            return message;
         }
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/RestOperations/SolutionResourcesRestOperations.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/RestOperations/SolutionResourcesRestOperations.cs
index 31d19d7a4dee..c002613db4a6 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/RestOperations/SolutionResourcesRestOperations.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/RestOperations/SolutionResourcesRestOperations.cs
@@ -6,311 +6,105 @@
 #nullable disable
 
 using System;
-using System.Text.Json;
-using System.Threading;
-using System.Threading.Tasks;
+using Azure;
 using Azure.Core;
 using Azure.Core.Pipeline;
-using Azure.ResourceManager.SelfHelp.Models;
 
 namespace Azure.ResourceManager.SelfHelp
 {
-    internal partial class SolutionResourcesRestOperations
+    internal partial class SolutionResources
     {
-        private readonly TelemetryDetails _userAgent;
-        private readonly HttpPipeline _pipeline;
         private readonly Uri _endpoint;
         private readonly string _apiVersion;
 
-        /// <summary> Initializes a new instance of SolutionResourcesRestOperations. </summary>
-        /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
-        /// <param name="applicationId"> The application id to use for user agent. </param>
-        /// <param name="endpoint"> Service host. </param>
-        /// <param name="apiVersion"> The API version to use for this operation. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="pipeline"/> or <paramref name="apiVersion"/> is null. </exception>
-        public SolutionResourcesRestOperations(HttpPipeline pipeline, string applicationId, Uri endpoint = null, string apiVersion = default)
+        /// <summary> Initializes a new instance of SolutionResources for mocking. </summary>
+        protected SolutionResources()
         {
-            _pipeline = pipeline ?? throw new ArgumentNullException(nameof(pipeline));
-            _endpoint = endpoint ?? new Uri("https://management.azure.com");
-            _apiVersion = apiVersion ?? "2024-03-01-preview";
-            _userAgent = new TelemetryDetails(GetType().Assembly, applicationId);
         }
 
-        internal RequestUriBuilder CreateGetRequestUri(string scope, string solutionResourceName)
-        {
-            var uri = new RawRequestUriBuilder();
-            uri.Reset(_endpoint);
-            uri.AppendPath("/", false);
-            uri.AppendPath(scope, false);
-            uri.AppendPath("/providers/Microsoft.Help/solutions/", false);
-            uri.AppendPath(solutionResourceName, true);
-            uri.AppendQuery("api-version", _apiVersion, true);
-            return uri;
-        }
-
-        internal HttpMessage CreateGetRequest(string scope, string solutionResourceName)
-        {
-            var message = _pipeline.CreateMessage();
-            var request = message.Request;
-            request.Method = RequestMethod.Get;
-            var uri = new RawRequestUriBuilder();
-            uri.Reset(_endpoint);
-            uri.AppendPath("/", false);
-            uri.AppendPath(scope, false);
-            uri.AppendPath("/providers/Microsoft.Help/solutions/", false);
-            uri.AppendPath(solutionResourceName, true);
-            uri.AppendQuery("api-version", _apiVersion, true);
-            request.Uri = uri;
-            request.Headers.Add("Accept", "application/json");
-            _userAgent.Apply(message);
-            return message;
-        }
-
-        /// <summary> Get the solution using the applicable solutionResourceName while creating the solution. </summary>
-        /// <param name="scope"> The fully qualified Azure Resource manager identifier of the resource. </param>
-        /// <param name="solutionResourceName"> Solution resource Name. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="scope"/> or <paramref name="solutionResourceName"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="solutionResourceName"/> is an empty string, and was expected to be non-empty. </exception>
-        public async Task<Response<SelfHelpSolutionData>> GetAsync(string scope, string solutionResourceName, CancellationToken cancellationToken = default)
+        /// <summary> Initializes a new instance of SolutionResources. </summary>
+        /// <param name="clientDiagnostics"> The ClientDiagnostics is used to provide tracing support for the client library. </param>
+        /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
+        /// <param name="endpoint"> Service endpoint. </param>
+        /// <param name="apiVersion"></param>
+        internal SolutionResources(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, Uri endpoint, string apiVersion)
         {
-            Argument.AssertNotNull(scope, nameof(scope));
-            Argument.AssertNotNullOrEmpty(solutionResourceName, nameof(solutionResourceName));
-
-            using var message = CreateGetRequest(scope, solutionResourceName);
-            await _pipeline.SendAsync(message, cancellationToken).ConfigureAwait(false);
-            switch (message.Response.Status)
-            {
-                case 200:
-                    {
-                        SelfHelpSolutionData value = default;
-                        using var document = await JsonDocument.ParseAsync(message.Response.ContentStream, ModelSerializationExtensions.JsonDocumentOptions, cancellationToken).ConfigureAwait(false);
-                        value = SelfHelpSolutionData.DeserializeSelfHelpSolutionData(document.RootElement);
-                        return Response.FromValue(value, message.Response);
-                    }
-                case 404:
-                    return Response.FromValue((SelfHelpSolutionData)null, message.Response);
-                default:
-                    throw new RequestFailedException(message.Response);
-            }
+            ClientDiagnostics = clientDiagnostics;
+            _endpoint = endpoint;
+            Pipeline = pipeline;
+            _apiVersion = apiVersion;
         }
 
-        /// <summary> Get the solution using the applicable solutionResourceName while creating the solution. </summary>
-        /// <param name="scope"> The fully qualified Azure Resource manager identifier of the resource. </param>
-        /// <param name="solutionResourceName"> Solution resource Name. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="scope"/> or <paramref name="solutionResourceName"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="solutionResourceName"/> is an empty string, and was expected to be non-empty. </exception>
-        public Response<SelfHelpSolutionData> Get(string scope, string solutionResourceName, CancellationToken cancellationToken = default)
-        {
-            Argument.AssertNotNull(scope, nameof(scope));
-            Argument.AssertNotNullOrEmpty(solutionResourceName, nameof(solutionResourceName));
+        /// <summary> The HTTP pipeline for sending and receiving REST requests and responses. </summary>
+        public virtual HttpPipeline Pipeline { get; }
 
-            using var message = CreateGetRequest(scope, solutionResourceName);
-            _pipeline.Send(message, cancellationToken);
-            switch (message.Response.Status)
-            {
-                case 200:
-                    {
-                        SelfHelpSolutionData value = default;
-                        using var document = JsonDocument.Parse(message.Response.ContentStream, ModelSerializationExtensions.JsonDocumentOptions);
-                        value = SelfHelpSolutionData.DeserializeSelfHelpSolutionData(document.RootElement);
-                        return Response.FromValue(value, message.Response);
-                    }
-                case 404:
-                    return Response.FromValue((SelfHelpSolutionData)null, message.Response);
-                default:
-                    throw new RequestFailedException(message.Response);
-            }
-        }
+        /// <summary> The ClientDiagnostics is used to provide tracing support for the client library. </summary>
+        internal ClientDiagnostics ClientDiagnostics { get; }
 
-        internal RequestUriBuilder CreateCreateRequestUri(string scope, string solutionResourceName, SelfHelpSolutionData data)
+        internal HttpMessage CreateGetRequest(string scope, string solutionResourceName, RequestContext context)
         {
-            var uri = new RawRequestUriBuilder();
+            RawRequestUriBuilder uri = new RawRequestUriBuilder();
             uri.Reset(_endpoint);
             uri.AppendPath("/", false);
             uri.AppendPath(scope, false);
             uri.AppendPath("/providers/Microsoft.Help/solutions/", false);
             uri.AppendPath(solutionResourceName, true);
             uri.AppendQuery("api-version", _apiVersion, true);
-            return uri;
+            HttpMessage message = Pipeline.CreateMessage();
+            Request request = message.Request;
+            request.Uri = uri;
+            request.Method = RequestMethod.Get;
+            request.Headers.SetValue("Accept", "application/json");
+            return message;
         }
 
-        internal HttpMessage CreateCreateRequest(string scope, string solutionResourceName, SelfHelpSolutionData data)
+        internal HttpMessage CreateCreateRequest(string scope, string solutionResourceName, RequestContent content, RequestContext context)
         {
-            var message = _pipeline.CreateMessage();
-            var request = message.Request;
-            request.Method = RequestMethod.Put;
-            var uri = new RawRequestUriBuilder();
+            RawRequestUriBuilder uri = new RawRequestUriBuilder();
             uri.Reset(_endpoint);
             uri.AppendPath("/", false);
             uri.AppendPath(scope, false);
             uri.AppendPath("/providers/Microsoft.Help/solutions/", false);
             uri.AppendPath(solutionResourceName, true);
             uri.AppendQuery("api-version", _apiVersion, true);
+            HttpMessage message = Pipeline.CreateMessage();
+            Request request = message.Request;
             request.Uri = uri;
-            request.Headers.Add("Accept", "application/json");
-            request.Headers.Add("Content-Type", "application/json");
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(data, ModelSerializationExtensions.WireOptions);
-            request.Content = content;
-            _userAgent.Apply(message);
-            return message;
-        }
-
-        /// <summary> Creates a solution for the specific Azure resource or subscription using the inputs ‘solutionId and requiredInputs’ from discovery solutions. &lt;br/&gt; Azure solutions comprise a comprehensive library of self-help resources that have been thoughtfully curated by Azure engineers to aid customers in resolving typical troubleshooting issues. These solutions encompass: &lt;br/&gt; (1.) Dynamic and context-aware diagnostics, guided troubleshooting wizards, and data visualizations. &lt;br/&gt; (2.) Rich instructional video tutorials and illustrative diagrams and images. &lt;br/&gt; (3.) Thoughtfully assembled textual troubleshooting instructions. &lt;br/&gt; All these components are seamlessly converged into unified solutions tailored to address a specific support problem area. </summary>
-        /// <param name="scope"> The fully qualified Azure Resource manager identifier of the resource. </param>
-        /// <param name="solutionResourceName"> Solution resource Name. </param>
-        /// <param name="data"> The required request body for this solution resource creation. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="scope"/>, <paramref name="solutionResourceName"/> or <paramref name="data"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="solutionResourceName"/> is an empty string, and was expected to be non-empty. </exception>
-        public async Task<Response> CreateAsync(string scope, string solutionResourceName, SelfHelpSolutionData data, CancellationToken cancellationToken = default)
-        {
-            Argument.AssertNotNull(scope, nameof(scope));
-            Argument.AssertNotNullOrEmpty(solutionResourceName, nameof(solutionResourceName));
-            Argument.AssertNotNull(data, nameof(data));
-
-            using var message = CreateCreateRequest(scope, solutionResourceName, data);
-            await _pipeline.SendAsync(message, cancellationToken).ConfigureAwait(false);
-            switch (message.Response.Status)
-            {
-                case 200:
-                case 201:
-                    return message.Response;
-                default:
-                    throw new RequestFailedException(message.Response);
-            }
-        }
-
-        /// <summary> Creates a solution for the specific Azure resource or subscription using the inputs ‘solutionId and requiredInputs’ from discovery solutions. &lt;br/&gt; Azure solutions comprise a comprehensive library of self-help resources that have been thoughtfully curated by Azure engineers to aid customers in resolving typical troubleshooting issues. These solutions encompass: &lt;br/&gt; (1.) Dynamic and context-aware diagnostics, guided troubleshooting wizards, and data visualizations. &lt;br/&gt; (2.) Rich instructional video tutorials and illustrative diagrams and images. &lt;br/&gt; (3.) Thoughtfully assembled textual troubleshooting instructions. &lt;br/&gt; All these components are seamlessly converged into unified solutions tailored to address a specific support problem area. </summary>
-        /// <param name="scope"> The fully qualified Azure Resource manager identifier of the resource. </param>
-        /// <param name="solutionResourceName"> Solution resource Name. </param>
-        /// <param name="data"> The required request body for this solution resource creation. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="scope"/>, <paramref name="solutionResourceName"/> or <paramref name="data"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="solutionResourceName"/> is an empty string, and was expected to be non-empty. </exception>
-        public Response Create(string scope, string solutionResourceName, SelfHelpSolutionData data, CancellationToken cancellationToken = default)
-        {
-            Argument.AssertNotNull(scope, nameof(scope));
-            Argument.AssertNotNullOrEmpty(solutionResourceName, nameof(solutionResourceName));
-            Argument.AssertNotNull(data, nameof(data));
-
-            using var message = CreateCreateRequest(scope, solutionResourceName, data);
-            _pipeline.Send(message, cancellationToken);
-            switch (message.Response.Status)
+            request.Method = RequestMethod.Put;
+            if ("application/json" != null)
             {
-                case 200:
-                case 201:
-                    return message.Response;
-                default:
-                    throw new RequestFailedException(message.Response);
+                request.Headers.SetValue("Content-Type", "application/json");
             }
+            request.Headers.SetValue("Accept", "application/json");
+            request.Content = content;
+            return message;
         }
 
-        internal RequestUriBuilder CreateUpdateRequestUri(string scope, string solutionResourceName, SelfHelpSolutionPatch patch)
-        {
-            var uri = new RawRequestUriBuilder();
-            uri.Reset(_endpoint);
-            uri.AppendPath("/", false);
-            uri.AppendPath(scope, false);
-            uri.AppendPath("/providers/Microsoft.Help/solutions/", false);
-            uri.AppendPath(solutionResourceName, true);
-            uri.AppendQuery("api-version", _apiVersion, true);
-            return uri;
-        }
-
-        internal HttpMessage CreateUpdateRequest(string scope, string solutionResourceName, SelfHelpSolutionPatch patch)
+        internal HttpMessage CreateUpdateRequest(string scope, string solutionResourceName, RequestContent content, RequestContext context)
         {
-            var message = _pipeline.CreateMessage();
-            var request = message.Request;
-            request.Method = RequestMethod.Patch;
-            var uri = new RawRequestUriBuilder();
+            RawRequestUriBuilder uri = new RawRequestUriBuilder();
             uri.Reset(_endpoint);
             uri.AppendPath("/", false);
             uri.AppendPath(scope, false);
             uri.AppendPath("/providers/Microsoft.Help/solutions/", false);
             uri.AppendPath(solutionResourceName, true);
             uri.AppendQuery("api-version", _apiVersion, true);
+            HttpMessage message = Pipeline.CreateMessage();
+            Request request = message.Request;
             request.Uri = uri;
-            request.Headers.Add("Accept", "application/json");
-            request.Headers.Add("Content-Type", "application/json");
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(patch, ModelSerializationExtensions.WireOptions);
-            request.Content = content;
-            _userAgent.Apply(message);
-            return message;
-        }
-
-        /// <summary> Update the requiredInputs or additional information needed to execute the solution. </summary>
-        /// <param name="scope"> The fully qualified Azure Resource manager identifier of the resource. </param>
-        /// <param name="solutionResourceName"> Solution resource Name. </param>
-        /// <param name="patch"> The required request body for updating a solution resource. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="scope"/>, <paramref name="solutionResourceName"/> or <paramref name="patch"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="solutionResourceName"/> is an empty string, and was expected to be non-empty. </exception>
-        public async Task<Response> UpdateAsync(string scope, string solutionResourceName, SelfHelpSolutionPatch patch, CancellationToken cancellationToken = default)
-        {
-            Argument.AssertNotNull(scope, nameof(scope));
-            Argument.AssertNotNullOrEmpty(solutionResourceName, nameof(solutionResourceName));
-            Argument.AssertNotNull(patch, nameof(patch));
-
-            using var message = CreateUpdateRequest(scope, solutionResourceName, patch);
-            await _pipeline.SendAsync(message, cancellationToken).ConfigureAwait(false);
-            switch (message.Response.Status)
-            {
-                case 200:
-                case 202:
-                    return message.Response;
-                default:
-                    throw new RequestFailedException(message.Response);
-            }
-        }
-
-        /// <summary> Update the requiredInputs or additional information needed to execute the solution. </summary>
-        /// <param name="scope"> The fully qualified Azure Resource manager identifier of the resource. </param>
-        /// <param name="solutionResourceName"> Solution resource Name. </param>
-        /// <param name="patch"> The required request body for updating a solution resource. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="scope"/>, <paramref name="solutionResourceName"/> or <paramref name="patch"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="solutionResourceName"/> is an empty string, and was expected to be non-empty. </exception>
-        public Response Update(string scope, string solutionResourceName, SelfHelpSolutionPatch patch, CancellationToken cancellationToken = default)
-        {
-            Argument.AssertNotNull(scope, nameof(scope));
-            Argument.AssertNotNullOrEmpty(solutionResourceName, nameof(solutionResourceName));
-            Argument.AssertNotNull(patch, nameof(patch));
-
-            using var message = CreateUpdateRequest(scope, solutionResourceName, patch);
-            _pipeline.Send(message, cancellationToken);
-            switch (message.Response.Status)
+            request.Method = RequestMethod.Patch;
+            if ("application/json" != null)
             {
-                case 200:
-                case 202:
-                    return message.Response;
-                default:
-                    throw new RequestFailedException(message.Response);
+                request.Headers.SetValue("Content-Type", "application/json");
             }
+            request.Headers.SetValue("Accept", "application/json");
+            request.Content = content;
+            return message;
         }
 
-        internal RequestUriBuilder CreateWarmUpRequestUri(string scope, string solutionResourceName, SolutionWarmUpContent content)
-        {
-            var uri = new RawRequestUriBuilder();
-            uri.Reset(_endpoint);
-            uri.AppendPath("/", false);
-            uri.AppendPath(scope, false);
-            uri.AppendPath("/providers/Microsoft.Help/solutions/", false);
-            uri.AppendPath(solutionResourceName, true);
-            uri.AppendPath("/warmup", false);
-            uri.AppendQuery("api-version", _apiVersion, true);
-            return uri;
-        }
-
-        internal HttpMessage CreateWarmUpRequest(string scope, string solutionResourceName, SolutionWarmUpContent content)
+        internal HttpMessage CreateWarmUpRequest(string scope, string solutionResourceName, RequestContent content, RequestContext context)
         {
-            var message = _pipeline.CreateMessage();
-            var request = message.Request;
-            request.Method = RequestMethod.Post;
-            var uri = new RawRequestUriBuilder();
+            RawRequestUriBuilder uri = new RawRequestUriBuilder();
             uri.Reset(_endpoint);
             uri.AppendPath("/", false);
             uri.AppendPath(scope, false);
@@ -318,62 +112,16 @@ internal HttpMessage CreateWarmUpRequest(string scope, string solutionResourceNa
             uri.AppendPath(solutionResourceName, true);
             uri.AppendPath("/warmup", false);
             uri.AppendQuery("api-version", _apiVersion, true);
+            HttpMessage message = Pipeline.CreateMessage();
+            Request request = message.Request;
             request.Uri = uri;
-            if (content != null)
+            request.Method = RequestMethod.Post;
+            if ("application/json" != null)
             {
-                request.Headers.Add("Content-Type", "application/json");
-                var content0 = new Utf8JsonRequestContent();
-                content0.JsonWriter.WriteObjectValue(content, ModelSerializationExtensions.WireOptions);
-                request.Content = content0;
+                request.Headers.SetValue("Content-Type", "application/json");
             }
-            _userAgent.Apply(message);
+            request.Content = content;
             return message;
         }
-
-        /// <summary> Warm up the solution resource by preloading asynchronous diagnostics results into cache. </summary>
-        /// <param name="scope"> The fully qualified Azure Resource manager identifier of the resource. </param>
-        /// <param name="solutionResourceName"> Solution resource Name. </param>
-        /// <param name="content"> The required request body for warming up a solution resource. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="scope"/> or <paramref name="solutionResourceName"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="solutionResourceName"/> is an empty string, and was expected to be non-empty. </exception>
-        public async Task<Response> WarmUpAsync(string scope, string solutionResourceName, SolutionWarmUpContent content = null, CancellationToken cancellationToken = default)
-        {
-            Argument.AssertNotNull(scope, nameof(scope));
-            Argument.AssertNotNullOrEmpty(solutionResourceName, nameof(solutionResourceName));
-
-            using var message = CreateWarmUpRequest(scope, solutionResourceName, content);
-            await _pipeline.SendAsync(message, cancellationToken).ConfigureAwait(false);
-            switch (message.Response.Status)
-            {
-                case 204:
-                    return message.Response;
-                default:
-                    throw new RequestFailedException(message.Response);
-            }
-        }
-
-        /// <summary> Warm up the solution resource by preloading asynchronous diagnostics results into cache. </summary>
-        /// <param name="scope"> The fully qualified Azure Resource manager identifier of the resource. </param>
-        /// <param name="solutionResourceName"> Solution resource Name. </param>
-        /// <param name="content"> The required request body for warming up a solution resource. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="scope"/> or <paramref name="solutionResourceName"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="solutionResourceName"/> is an empty string, and was expected to be non-empty. </exception>
-        public Response WarmUp(string scope, string solutionResourceName, SolutionWarmUpContent content = null, CancellationToken cancellationToken = default)
-        {
-            Argument.AssertNotNull(scope, nameof(scope));
-            Argument.AssertNotNullOrEmpty(solutionResourceName, nameof(solutionResourceName));
-
-            using var message = CreateWarmUpRequest(scope, solutionResourceName, content);
-            _pipeline.Send(message, cancellationToken);
-            switch (message.Response.Status)
-            {
-                case 204:
-                    return message.Response;
-                default:
-                    throw new RequestFailedException(message.Response);
-            }
-        }
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/RestOperations/SolutionSelfHelpRestOperations.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/RestOperations/SolutionSelfHelpRestOperations.cs
index 7455231cca91..9a467635497e 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/RestOperations/SolutionSelfHelpRestOperations.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/RestOperations/SolutionSelfHelpRestOperations.cs
@@ -6,110 +6,54 @@
 #nullable disable
 
 using System;
-using System.Text.Json;
-using System.Threading;
-using System.Threading.Tasks;
+using Azure;
 using Azure.Core;
 using Azure.Core.Pipeline;
-using Azure.ResourceManager.SelfHelp.Models;
 
 namespace Azure.ResourceManager.SelfHelp
 {
-    internal partial class SolutionSelfHelpRestOperations
+    internal partial class SolutionSelfHelp
     {
-        private readonly TelemetryDetails _userAgent;
-        private readonly HttpPipeline _pipeline;
         private readonly Uri _endpoint;
         private readonly string _apiVersion;
 
-        /// <summary> Initializes a new instance of SolutionSelfHelpRestOperations. </summary>
-        /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
-        /// <param name="applicationId"> The application id to use for user agent. </param>
-        /// <param name="endpoint"> Service host. </param>
-        /// <param name="apiVersion"> The API version to use for this operation. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="pipeline"/> or <paramref name="apiVersion"/> is null. </exception>
-        public SolutionSelfHelpRestOperations(HttpPipeline pipeline, string applicationId, Uri endpoint = null, string apiVersion = default)
+        /// <summary> Initializes a new instance of SolutionSelfHelp for mocking. </summary>
+        protected SolutionSelfHelp()
         {
-            _pipeline = pipeline ?? throw new ArgumentNullException(nameof(pipeline));
-            _endpoint = endpoint ?? new Uri("https://management.azure.com");
-            _apiVersion = apiVersion ?? "2024-03-01-preview";
-            _userAgent = new TelemetryDetails(GetType().Assembly, applicationId);
         }
 
-        internal RequestUriBuilder CreateGetSelfHelpSolutionByIdRequestUri(string solutionId)
+        /// <summary> Initializes a new instance of SolutionSelfHelp. </summary>
+        /// <param name="clientDiagnostics"> The ClientDiagnostics is used to provide tracing support for the client library. </param>
+        /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
+        /// <param name="endpoint"> Service endpoint. </param>
+        /// <param name="apiVersion"></param>
+        internal SolutionSelfHelp(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, Uri endpoint, string apiVersion)
         {
-            var uri = new RawRequestUriBuilder();
-            uri.Reset(_endpoint);
-            uri.AppendPath("/providers/Microsoft.Help/selfHelp/", false);
-            uri.AppendPath(solutionId, true);
-            uri.AppendQuery("api-version", _apiVersion, true);
-            return uri;
+            ClientDiagnostics = clientDiagnostics;
+            _endpoint = endpoint;
+            Pipeline = pipeline;
+            _apiVersion = apiVersion;
         }
 
-        internal HttpMessage CreateGetSelfHelpSolutionByIdRequest(string solutionId)
+        /// <summary> The HTTP pipeline for sending and receiving REST requests and responses. </summary>
+        public virtual HttpPipeline Pipeline { get; }
+
+        /// <summary> The ClientDiagnostics is used to provide tracing support for the client library. </summary>
+        internal ClientDiagnostics ClientDiagnostics { get; }
+
+        internal HttpMessage CreateGetSelfHelpSolutionByIdRequest(string solutionId, RequestContext context)
         {
-            var message = _pipeline.CreateMessage();
-            var request = message.Request;
-            request.Method = RequestMethod.Get;
-            var uri = new RawRequestUriBuilder();
+            RawRequestUriBuilder uri = new RawRequestUriBuilder();
             uri.Reset(_endpoint);
             uri.AppendPath("/providers/Microsoft.Help/selfHelp/", false);
             uri.AppendPath(solutionId, true);
             uri.AppendQuery("api-version", _apiVersion, true);
+            HttpMessage message = Pipeline.CreateMessage();
+            Request request = message.Request;
             request.Uri = uri;
-            request.Headers.Add("Accept", "application/json");
-            _userAgent.Apply(message);
+            request.Method = RequestMethod.Get;
+            request.Headers.SetValue("Accept", "application/json");
             return message;
         }
-
-        /// <summary> Gets Self Help Solutions for a given solutionId. Self Help Solutions consist of rich instructional video tutorials, links and guides to public documentation related to a specific problem that enables users to troubleshoot Azure issues. </summary>
-        /// <param name="solutionId"> SolutionId is a unique id to identify a solution. You can retrieve the solution id using the Discovery api - https://learn.microsoft.com/en-us/rest/api/help/discovery-solution/list?view=rest-help-2023-09-01-preview&amp;tabs=HTTP. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="solutionId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="solutionId"/> is an empty string, and was expected to be non-empty. </exception>
-        public async Task<Response<SelfHelpSolutionResult>> GetSelfHelpSolutionByIdAsync(string solutionId, CancellationToken cancellationToken = default)
-        {
-            Argument.AssertNotNullOrEmpty(solutionId, nameof(solutionId));
-
-            using var message = CreateGetSelfHelpSolutionByIdRequest(solutionId);
-            await _pipeline.SendAsync(message, cancellationToken).ConfigureAwait(false);
-            switch (message.Response.Status)
-            {
-                case 200:
-                    {
-                        SelfHelpSolutionResult value = default;
-                        using var document = await JsonDocument.ParseAsync(message.Response.ContentStream, ModelSerializationExtensions.JsonDocumentOptions, cancellationToken).ConfigureAwait(false);
-                        value = SelfHelpSolutionResult.DeserializeSelfHelpSolutionResult(document.RootElement);
-                        return Response.FromValue(value, message.Response);
-                    }
-                default:
-                    throw new RequestFailedException(message.Response);
-            }
-        }
-
-        /// <summary> Gets Self Help Solutions for a given solutionId. Self Help Solutions consist of rich instructional video tutorials, links and guides to public documentation related to a specific problem that enables users to troubleshoot Azure issues. </summary>
-        /// <param name="solutionId"> SolutionId is a unique id to identify a solution. You can retrieve the solution id using the Discovery api - https://learn.microsoft.com/en-us/rest/api/help/discovery-solution/list?view=rest-help-2023-09-01-preview&amp;tabs=HTTP. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="solutionId"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="solutionId"/> is an empty string, and was expected to be non-empty. </exception>
-        public Response<SelfHelpSolutionResult> GetSelfHelpSolutionById(string solutionId, CancellationToken cancellationToken = default)
-        {
-            Argument.AssertNotNullOrEmpty(solutionId, nameof(solutionId));
-
-            using var message = CreateGetSelfHelpSolutionByIdRequest(solutionId);
-            _pipeline.Send(message, cancellationToken);
-            switch (message.Response.Status)
-            {
-                case 200:
-                    {
-                        SelfHelpSolutionResult value = default;
-                        using var document = JsonDocument.Parse(message.Response.ContentStream, ModelSerializationExtensions.JsonDocumentOptions);
-                        value = SelfHelpSolutionResult.DeserializeSelfHelpSolutionResult(document.RootElement);
-                        return Response.FromValue(value, message.Response);
-                    }
-                default:
-                    throw new RequestFailedException(message.Response);
-            }
-        }
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/RestOperations/TroubleshooterResourcesRestOperations.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/RestOperations/TroubleshooterResourcesRestOperations.cs
index 98fc22bc86fe..dc4ce533a494 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/RestOperations/TroubleshooterResourcesRestOperations.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/RestOperations/TroubleshooterResourcesRestOperations.cs
@@ -6,237 +6,83 @@
 #nullable disable
 
 using System;
-using System.Text.Json;
-using System.Threading;
-using System.Threading.Tasks;
+using Azure;
 using Azure.Core;
 using Azure.Core.Pipeline;
-using Azure.ResourceManager.SelfHelp.Models;
 
 namespace Azure.ResourceManager.SelfHelp
 {
-    internal partial class TroubleshooterResourcesRestOperations
+    internal partial class TroubleshooterResources
     {
-        private readonly TelemetryDetails _userAgent;
-        private readonly HttpPipeline _pipeline;
         private readonly Uri _endpoint;
         private readonly string _apiVersion;
 
-        /// <summary> Initializes a new instance of TroubleshooterResourcesRestOperations. </summary>
-        /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
-        /// <param name="applicationId"> The application id to use for user agent. </param>
-        /// <param name="endpoint"> Service host. </param>
-        /// <param name="apiVersion"> The API version to use for this operation. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="pipeline"/> or <paramref name="apiVersion"/> is null. </exception>
-        public TroubleshooterResourcesRestOperations(HttpPipeline pipeline, string applicationId, Uri endpoint = null, string apiVersion = default)
-        {
-            _pipeline = pipeline ?? throw new ArgumentNullException(nameof(pipeline));
-            _endpoint = endpoint ?? new Uri("https://management.azure.com");
-            _apiVersion = apiVersion ?? "2024-03-01-preview";
-            _userAgent = new TelemetryDetails(GetType().Assembly, applicationId);
-        }
-
-        internal RequestUriBuilder CreateGetRequestUri(string scope, string troubleshooterName)
+        /// <summary> Initializes a new instance of TroubleshooterResources for mocking. </summary>
+        protected TroubleshooterResources()
         {
-            var uri = new RawRequestUriBuilder();
-            uri.Reset(_endpoint);
-            uri.AppendPath("/", false);
-            uri.AppendPath(scope, false);
-            uri.AppendPath("/providers/Microsoft.Help/troubleshooters/", false);
-            uri.AppendPath(troubleshooterName, true);
-            uri.AppendQuery("api-version", _apiVersion, true);
-            return uri;
         }
 
-        internal HttpMessage CreateGetRequest(string scope, string troubleshooterName)
-        {
-            var message = _pipeline.CreateMessage();
-            var request = message.Request;
-            request.Method = RequestMethod.Get;
-            var uri = new RawRequestUriBuilder();
-            uri.Reset(_endpoint);
-            uri.AppendPath("/", false);
-            uri.AppendPath(scope, false);
-            uri.AppendPath("/providers/Microsoft.Help/troubleshooters/", false);
-            uri.AppendPath(troubleshooterName, true);
-            uri.AppendQuery("api-version", _apiVersion, true);
-            request.Uri = uri;
-            request.Headers.Add("Accept", "application/json");
-            _userAgent.Apply(message);
-            return message;
-        }
-
-        /// <summary> Gets troubleshooter instance result which includes the step status/result of the troubleshooter resource name that is being executed.&lt;br/&gt; Get API is used to retrieve the result of a Troubleshooter instance, which includes the status and result of each step in the Troubleshooter workflow. This API requires the Troubleshooter resource name that was created using the Create API. </summary>
-        /// <param name="scope"> The fully qualified Azure Resource manager identifier of the resource. </param>
-        /// <param name="troubleshooterName"> Troubleshooter resource Name. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="scope"/> or <paramref name="troubleshooterName"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="troubleshooterName"/> is an empty string, and was expected to be non-empty. </exception>
-        public async Task<Response<SelfHelpTroubleshooterData>> GetAsync(string scope, string troubleshooterName, CancellationToken cancellationToken = default)
+        /// <summary> Initializes a new instance of TroubleshooterResources. </summary>
+        /// <param name="clientDiagnostics"> The ClientDiagnostics is used to provide tracing support for the client library. </param>
+        /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
+        /// <param name="endpoint"> Service endpoint. </param>
+        /// <param name="apiVersion"></param>
+        internal TroubleshooterResources(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, Uri endpoint, string apiVersion)
         {
-            Argument.AssertNotNull(scope, nameof(scope));
-            Argument.AssertNotNullOrEmpty(troubleshooterName, nameof(troubleshooterName));
-
-            using var message = CreateGetRequest(scope, troubleshooterName);
-            await _pipeline.SendAsync(message, cancellationToken).ConfigureAwait(false);
-            switch (message.Response.Status)
-            {
-                case 200:
-                    {
-                        SelfHelpTroubleshooterData value = default;
-                        using var document = await JsonDocument.ParseAsync(message.Response.ContentStream, ModelSerializationExtensions.JsonDocumentOptions, cancellationToken).ConfigureAwait(false);
-                        value = SelfHelpTroubleshooterData.DeserializeSelfHelpTroubleshooterData(document.RootElement);
-                        return Response.FromValue(value, message.Response);
-                    }
-                case 404:
-                    return Response.FromValue((SelfHelpTroubleshooterData)null, message.Response);
-                default:
-                    throw new RequestFailedException(message.Response);
-            }
+            ClientDiagnostics = clientDiagnostics;
+            _endpoint = endpoint;
+            Pipeline = pipeline;
+            _apiVersion = apiVersion;
         }
 
-        /// <summary> Gets troubleshooter instance result which includes the step status/result of the troubleshooter resource name that is being executed.&lt;br/&gt; Get API is used to retrieve the result of a Troubleshooter instance, which includes the status and result of each step in the Troubleshooter workflow. This API requires the Troubleshooter resource name that was created using the Create API. </summary>
-        /// <param name="scope"> The fully qualified Azure Resource manager identifier of the resource. </param>
-        /// <param name="troubleshooterName"> Troubleshooter resource Name. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="scope"/> or <paramref name="troubleshooterName"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="troubleshooterName"/> is an empty string, and was expected to be non-empty. </exception>
-        public Response<SelfHelpTroubleshooterData> Get(string scope, string troubleshooterName, CancellationToken cancellationToken = default)
-        {
-            Argument.AssertNotNull(scope, nameof(scope));
-            Argument.AssertNotNullOrEmpty(troubleshooterName, nameof(troubleshooterName));
+        /// <summary> The HTTP pipeline for sending and receiving REST requests and responses. </summary>
+        public virtual HttpPipeline Pipeline { get; }
 
-            using var message = CreateGetRequest(scope, troubleshooterName);
-            _pipeline.Send(message, cancellationToken);
-            switch (message.Response.Status)
-            {
-                case 200:
-                    {
-                        SelfHelpTroubleshooterData value = default;
-                        using var document = JsonDocument.Parse(message.Response.ContentStream, ModelSerializationExtensions.JsonDocumentOptions);
-                        value = SelfHelpTroubleshooterData.DeserializeSelfHelpTroubleshooterData(document.RootElement);
-                        return Response.FromValue(value, message.Response);
-                    }
-                case 404:
-                    return Response.FromValue((SelfHelpTroubleshooterData)null, message.Response);
-                default:
-                    throw new RequestFailedException(message.Response);
-            }
-        }
+        /// <summary> The ClientDiagnostics is used to provide tracing support for the client library. </summary>
+        internal ClientDiagnostics ClientDiagnostics { get; }
 
-        internal RequestUriBuilder CreateCreateRequestUri(string scope, string troubleshooterName, SelfHelpTroubleshooterData data)
+        internal HttpMessage CreateGetRequest(string scope, string troubleshooterName, RequestContext context)
         {
-            var uri = new RawRequestUriBuilder();
+            RawRequestUriBuilder uri = new RawRequestUriBuilder();
             uri.Reset(_endpoint);
             uri.AppendPath("/", false);
             uri.AppendPath(scope, false);
             uri.AppendPath("/providers/Microsoft.Help/troubleshooters/", false);
             uri.AppendPath(troubleshooterName, true);
             uri.AppendQuery("api-version", _apiVersion, true);
-            return uri;
+            HttpMessage message = Pipeline.CreateMessage();
+            Request request = message.Request;
+            request.Uri = uri;
+            request.Method = RequestMethod.Get;
+            request.Headers.SetValue("Accept", "application/json");
+            return message;
         }
 
-        internal HttpMessage CreateCreateRequest(string scope, string troubleshooterName, SelfHelpTroubleshooterData data)
+        internal HttpMessage CreateCreateRequest(string scope, string troubleshooterName, RequestContent content, RequestContext context)
         {
-            var message = _pipeline.CreateMessage();
-            var request = message.Request;
-            request.Method = RequestMethod.Put;
-            var uri = new RawRequestUriBuilder();
+            RawRequestUriBuilder uri = new RawRequestUriBuilder();
             uri.Reset(_endpoint);
             uri.AppendPath("/", false);
             uri.AppendPath(scope, false);
             uri.AppendPath("/providers/Microsoft.Help/troubleshooters/", false);
             uri.AppendPath(troubleshooterName, true);
             uri.AppendQuery("api-version", _apiVersion, true);
+            HttpMessage message = Pipeline.CreateMessage();
+            Request request = message.Request;
             request.Uri = uri;
-            request.Headers.Add("Accept", "application/json");
-            request.Headers.Add("Content-Type", "application/json");
-            var content = new Utf8JsonRequestContent();
-            content.JsonWriter.WriteObjectValue(data, ModelSerializationExtensions.WireOptions);
-            request.Content = content;
-            _userAgent.Apply(message);
-            return message;
-        }
-
-        /// <summary> Creates the specific troubleshooter action under a resource or subscription using the ‘solutionId’ and  ‘properties.parameters’ as the trigger. &lt;br/&gt; Azure Troubleshooters help with hard to classify issues, reducing the gap between customer observed problems and solutions by guiding the user effortlessly through the troubleshooting process. Each Troubleshooter flow represents a problem area within Azure and has a complex tree-like structure that addresses many root causes. These flows are prepared with the help of Subject Matter experts and customer support engineers by carefully considering previous support requests raised by customers. Troubleshooters terminate at a well curated solution based off of resource backend signals and customer manual selections. </summary>
-        /// <param name="scope"> The fully qualified Azure Resource manager identifier of the resource. </param>
-        /// <param name="troubleshooterName"> Troubleshooter resource Name. </param>
-        /// <param name="data"> The required request body for this Troubleshooter resource creation. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="scope"/>, <paramref name="troubleshooterName"/> or <paramref name="data"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="troubleshooterName"/> is an empty string, and was expected to be non-empty. </exception>
-        public async Task<Response<SelfHelpTroubleshooterData>> CreateAsync(string scope, string troubleshooterName, SelfHelpTroubleshooterData data, CancellationToken cancellationToken = default)
-        {
-            Argument.AssertNotNull(scope, nameof(scope));
-            Argument.AssertNotNullOrEmpty(troubleshooterName, nameof(troubleshooterName));
-            Argument.AssertNotNull(data, nameof(data));
-
-            using var message = CreateCreateRequest(scope, troubleshooterName, data);
-            await _pipeline.SendAsync(message, cancellationToken).ConfigureAwait(false);
-            switch (message.Response.Status)
-            {
-                case 200:
-                case 201:
-                    {
-                        SelfHelpTroubleshooterData value = default;
-                        using var document = await JsonDocument.ParseAsync(message.Response.ContentStream, ModelSerializationExtensions.JsonDocumentOptions, cancellationToken).ConfigureAwait(false);
-                        value = SelfHelpTroubleshooterData.DeserializeSelfHelpTroubleshooterData(document.RootElement);
-                        return Response.FromValue(value, message.Response);
-                    }
-                default:
-                    throw new RequestFailedException(message.Response);
-            }
-        }
-
-        /// <summary> Creates the specific troubleshooter action under a resource or subscription using the ‘solutionId’ and  ‘properties.parameters’ as the trigger. &lt;br/&gt; Azure Troubleshooters help with hard to classify issues, reducing the gap between customer observed problems and solutions by guiding the user effortlessly through the troubleshooting process. Each Troubleshooter flow represents a problem area within Azure and has a complex tree-like structure that addresses many root causes. These flows are prepared with the help of Subject Matter experts and customer support engineers by carefully considering previous support requests raised by customers. Troubleshooters terminate at a well curated solution based off of resource backend signals and customer manual selections. </summary>
-        /// <param name="scope"> The fully qualified Azure Resource manager identifier of the resource. </param>
-        /// <param name="troubleshooterName"> Troubleshooter resource Name. </param>
-        /// <param name="data"> The required request body for this Troubleshooter resource creation. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="scope"/>, <paramref name="troubleshooterName"/> or <paramref name="data"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="troubleshooterName"/> is an empty string, and was expected to be non-empty. </exception>
-        public Response<SelfHelpTroubleshooterData> Create(string scope, string troubleshooterName, SelfHelpTroubleshooterData data, CancellationToken cancellationToken = default)
-        {
-            Argument.AssertNotNull(scope, nameof(scope));
-            Argument.AssertNotNullOrEmpty(troubleshooterName, nameof(troubleshooterName));
-            Argument.AssertNotNull(data, nameof(data));
-
-            using var message = CreateCreateRequest(scope, troubleshooterName, data);
-            _pipeline.Send(message, cancellationToken);
-            switch (message.Response.Status)
+            request.Method = RequestMethod.Put;
+            if ("application/json" != null)
             {
-                case 200:
-                case 201:
-                    {
-                        SelfHelpTroubleshooterData value = default;
-                        using var document = JsonDocument.Parse(message.Response.ContentStream, ModelSerializationExtensions.JsonDocumentOptions);
-                        value = SelfHelpTroubleshooterData.DeserializeSelfHelpTroubleshooterData(document.RootElement);
-                        return Response.FromValue(value, message.Response);
-                    }
-                default:
-                    throw new RequestFailedException(message.Response);
+                request.Headers.SetValue("Content-Type", "application/json");
             }
+            request.Headers.SetValue("Accept", "application/json");
+            request.Content = content;
+            return message;
         }
 
-        internal RequestUriBuilder CreateContinueRequestUri(string scope, string troubleshooterName, TroubleshooterContinueContent content)
-        {
-            var uri = new RawRequestUriBuilder();
-            uri.Reset(_endpoint);
-            uri.AppendPath("/", false);
-            uri.AppendPath(scope, false);
-            uri.AppendPath("/providers/Microsoft.Help/troubleshooters/", false);
-            uri.AppendPath(troubleshooterName, true);
-            uri.AppendPath("/continue", false);
-            uri.AppendQuery("api-version", _apiVersion, true);
-            return uri;
-        }
-
-        internal HttpMessage CreateContinueRequest(string scope, string troubleshooterName, TroubleshooterContinueContent content)
+        internal HttpMessage CreateContinueRequest(string scope, string troubleshooterName, RequestContent content, RequestContext context)
         {
-            var message = _pipeline.CreateMessage();
-            var request = message.Request;
-            request.Method = RequestMethod.Post;
-            var uri = new RawRequestUriBuilder();
+            RawRequestUriBuilder uri = new RawRequestUriBuilder();
             uri.Reset(_endpoint);
             uri.AppendPath("/", false);
             uri.AppendPath(scope, false);
@@ -244,83 +90,21 @@ internal HttpMessage CreateContinueRequest(string scope, string troubleshooterNa
             uri.AppendPath(troubleshooterName, true);
             uri.AppendPath("/continue", false);
             uri.AppendQuery("api-version", _apiVersion, true);
+            HttpMessage message = Pipeline.CreateMessage();
+            Request request = message.Request;
             request.Uri = uri;
-            if (content != null)
+            request.Method = RequestMethod.Post;
+            if ("application/json" != null)
             {
-                request.Headers.Add("Content-Type", "application/json");
-                var content0 = new Utf8JsonRequestContent();
-                content0.JsonWriter.WriteObjectValue(content, ModelSerializationExtensions.WireOptions);
-                request.Content = content0;
+                request.Headers.SetValue("Content-Type", "application/json");
             }
-            _userAgent.Apply(message);
+            request.Content = content;
             return message;
         }
 
-        /// <summary> Uses ‘stepId’ and ‘responses’ as the trigger to continue the troubleshooting steps for the respective troubleshooter resource name. &lt;br/&gt;Continue API is used to provide inputs that are required for the specific troubleshooter to progress into the next step in the process. This API is used after the Troubleshooter has been created using the Create API. </summary>
-        /// <param name="scope"> The fully qualified Azure Resource manager identifier of the resource. </param>
-        /// <param name="troubleshooterName"> Troubleshooter resource Name. </param>
-        /// <param name="content"> The required request body for going to next step in Troubleshooter resource. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="scope"/> or <paramref name="troubleshooterName"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="troubleshooterName"/> is an empty string, and was expected to be non-empty. </exception>
-        public async Task<Response> ContinueAsync(string scope, string troubleshooterName, TroubleshooterContinueContent content = null, CancellationToken cancellationToken = default)
-        {
-            Argument.AssertNotNull(scope, nameof(scope));
-            Argument.AssertNotNullOrEmpty(troubleshooterName, nameof(troubleshooterName));
-
-            using var message = CreateContinueRequest(scope, troubleshooterName, content);
-            await _pipeline.SendAsync(message, cancellationToken).ConfigureAwait(false);
-            switch (message.Response.Status)
-            {
-                case 204:
-                    return message.Response;
-                default:
-                    throw new RequestFailedException(message.Response);
-            }
-        }
-
-        /// <summary> Uses ‘stepId’ and ‘responses’ as the trigger to continue the troubleshooting steps for the respective troubleshooter resource name. &lt;br/&gt;Continue API is used to provide inputs that are required for the specific troubleshooter to progress into the next step in the process. This API is used after the Troubleshooter has been created using the Create API. </summary>
-        /// <param name="scope"> The fully qualified Azure Resource manager identifier of the resource. </param>
-        /// <param name="troubleshooterName"> Troubleshooter resource Name. </param>
-        /// <param name="content"> The required request body for going to next step in Troubleshooter resource. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="scope"/> or <paramref name="troubleshooterName"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="troubleshooterName"/> is an empty string, and was expected to be non-empty. </exception>
-        public Response Continue(string scope, string troubleshooterName, TroubleshooterContinueContent content = null, CancellationToken cancellationToken = default)
-        {
-            Argument.AssertNotNull(scope, nameof(scope));
-            Argument.AssertNotNullOrEmpty(troubleshooterName, nameof(troubleshooterName));
-
-            using var message = CreateContinueRequest(scope, troubleshooterName, content);
-            _pipeline.Send(message, cancellationToken);
-            switch (message.Response.Status)
-            {
-                case 204:
-                    return message.Response;
-                default:
-                    throw new RequestFailedException(message.Response);
-            }
-        }
-
-        internal RequestUriBuilder CreateEndRequestUri(string scope, string troubleshooterName)
+        internal HttpMessage CreateEndRequest(string scope, string troubleshooterName, RequestContext context)
         {
-            var uri = new RawRequestUriBuilder();
-            uri.Reset(_endpoint);
-            uri.AppendPath("/", false);
-            uri.AppendPath(scope, false);
-            uri.AppendPath("/providers/Microsoft.Help/troubleshooters/", false);
-            uri.AppendPath(troubleshooterName, true);
-            uri.AppendPath("/end", false);
-            uri.AppendQuery("api-version", _apiVersion, true);
-            return uri;
-        }
-
-        internal HttpMessage CreateEndRequest(string scope, string troubleshooterName)
-        {
-            var message = _pipeline.CreateMessage();
-            var request = message.Request;
-            request.Method = RequestMethod.Post;
-            var uri = new RawRequestUriBuilder();
+            RawRequestUriBuilder uri = new RawRequestUriBuilder();
             uri.Reset(_endpoint);
             uri.AppendPath("/", false);
             uri.AppendPath(scope, false);
@@ -328,74 +112,16 @@ internal HttpMessage CreateEndRequest(string scope, string troubleshooterName)
             uri.AppendPath(troubleshooterName, true);
             uri.AppendPath("/end", false);
             uri.AppendQuery("api-version", _apiVersion, true);
+            HttpMessage message = Pipeline.CreateMessage();
+            Request request = message.Request;
             request.Uri = uri;
-            _userAgent.Apply(message);
+            request.Method = RequestMethod.Post;
             return message;
         }
 
-        /// <summary> Ends the troubleshooter action. </summary>
-        /// <param name="scope"> The fully qualified Azure Resource manager identifier of the resource. </param>
-        /// <param name="troubleshooterName"> Troubleshooter resource Name. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="scope"/> or <paramref name="troubleshooterName"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="troubleshooterName"/> is an empty string, and was expected to be non-empty. </exception>
-        public async Task<Response> EndAsync(string scope, string troubleshooterName, CancellationToken cancellationToken = default)
-        {
-            Argument.AssertNotNull(scope, nameof(scope));
-            Argument.AssertNotNullOrEmpty(troubleshooterName, nameof(troubleshooterName));
-
-            using var message = CreateEndRequest(scope, troubleshooterName);
-            await _pipeline.SendAsync(message, cancellationToken).ConfigureAwait(false);
-            switch (message.Response.Status)
-            {
-                case 204:
-                    return message.Response;
-                default:
-                    throw new RequestFailedException(message.Response);
-            }
-        }
-
-        /// <summary> Ends the troubleshooter action. </summary>
-        /// <param name="scope"> The fully qualified Azure Resource manager identifier of the resource. </param>
-        /// <param name="troubleshooterName"> Troubleshooter resource Name. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="scope"/> or <paramref name="troubleshooterName"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="troubleshooterName"/> is an empty string, and was expected to be non-empty. </exception>
-        public Response End(string scope, string troubleshooterName, CancellationToken cancellationToken = default)
+        internal HttpMessage CreateRestartRequest(string scope, string troubleshooterName, RequestContext context)
         {
-            Argument.AssertNotNull(scope, nameof(scope));
-            Argument.AssertNotNullOrEmpty(troubleshooterName, nameof(troubleshooterName));
-
-            using var message = CreateEndRequest(scope, troubleshooterName);
-            _pipeline.Send(message, cancellationToken);
-            switch (message.Response.Status)
-            {
-                case 204:
-                    return message.Response;
-                default:
-                    throw new RequestFailedException(message.Response);
-            }
-        }
-
-        internal RequestUriBuilder CreateRestartRequestUri(string scope, string troubleshooterName)
-        {
-            var uri = new RawRequestUriBuilder();
-            uri.Reset(_endpoint);
-            uri.AppendPath("/", false);
-            uri.AppendPath(scope, false);
-            uri.AppendPath("/providers/Microsoft.Help/troubleshooters/", false);
-            uri.AppendPath(troubleshooterName, true);
-            uri.AppendPath("/restart", false);
-            uri.AppendQuery("api-version", _apiVersion, true);
-            return uri;
-        }
-
-        internal HttpMessage CreateRestartRequest(string scope, string troubleshooterName)
-        {
-            var message = _pipeline.CreateMessage();
-            var request = message.Request;
-            request.Method = RequestMethod.Post;
-            var uri = new RawRequestUriBuilder();
+            RawRequestUriBuilder uri = new RawRequestUriBuilder();
             uri.Reset(_endpoint);
             uri.AppendPath("/", false);
             uri.AppendPath(scope, false);
@@ -403,64 +129,12 @@ internal HttpMessage CreateRestartRequest(string scope, string troubleshooterNam
             uri.AppendPath(troubleshooterName, true);
             uri.AppendPath("/restart", false);
             uri.AppendQuery("api-version", _apiVersion, true);
+            HttpMessage message = Pipeline.CreateMessage();
+            Request request = message.Request;
             request.Uri = uri;
-            request.Headers.Add("Accept", "application/json");
-            _userAgent.Apply(message);
+            request.Method = RequestMethod.Post;
+            request.Headers.SetValue("Accept", "application/json");
             return message;
         }
-
-        /// <summary> Restarts the troubleshooter API using applicable troubleshooter resource name as the input.&lt;br/&gt; It returns new resource name which should be used in subsequent request. The old resource name is obsolete after this API is invoked. </summary>
-        /// <param name="scope"> The fully qualified Azure Resource manager identifier of the resource. </param>
-        /// <param name="troubleshooterName"> Troubleshooter resource Name. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="scope"/> or <paramref name="troubleshooterName"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="troubleshooterName"/> is an empty string, and was expected to be non-empty. </exception>
-        public async Task<Response<RestartTroubleshooterResult>> RestartAsync(string scope, string troubleshooterName, CancellationToken cancellationToken = default)
-        {
-            Argument.AssertNotNull(scope, nameof(scope));
-            Argument.AssertNotNullOrEmpty(troubleshooterName, nameof(troubleshooterName));
-
-            using var message = CreateRestartRequest(scope, troubleshooterName);
-            await _pipeline.SendAsync(message, cancellationToken).ConfigureAwait(false);
-            switch (message.Response.Status)
-            {
-                case 200:
-                    {
-                        RestartTroubleshooterResult value = default;
-                        using var document = await JsonDocument.ParseAsync(message.Response.ContentStream, ModelSerializationExtensions.JsonDocumentOptions, cancellationToken).ConfigureAwait(false);
-                        value = RestartTroubleshooterResult.DeserializeRestartTroubleshooterResult(document.RootElement);
-                        return Response.FromValue(value, message.Response);
-                    }
-                default:
-                    throw new RequestFailedException(message.Response);
-            }
-        }
-
-        /// <summary> Restarts the troubleshooter API using applicable troubleshooter resource name as the input.&lt;br/&gt; It returns new resource name which should be used in subsequent request. The old resource name is obsolete after this API is invoked. </summary>
-        /// <param name="scope"> The fully qualified Azure Resource manager identifier of the resource. </param>
-        /// <param name="troubleshooterName"> Troubleshooter resource Name. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="scope"/> or <paramref name="troubleshooterName"/> is null. </exception>
-        /// <exception cref="ArgumentException"> <paramref name="troubleshooterName"/> is an empty string, and was expected to be non-empty. </exception>
-        public Response<RestartTroubleshooterResult> Restart(string scope, string troubleshooterName, CancellationToken cancellationToken = default)
-        {
-            Argument.AssertNotNull(scope, nameof(scope));
-            Argument.AssertNotNullOrEmpty(troubleshooterName, nameof(troubleshooterName));
-
-            using var message = CreateRestartRequest(scope, troubleshooterName);
-            _pipeline.Send(message, cancellationToken);
-            switch (message.Response.Status)
-            {
-                case 200:
-                    {
-                        RestartTroubleshooterResult value = default;
-                        using var document = JsonDocument.Parse(message.Response.ContentStream, ModelSerializationExtensions.JsonDocumentOptions);
-                        value = RestartTroubleshooterResult.DeserializeRestartTroubleshooterResult(document.RootElement);
-                        return Response.FromValue(value, message.Response);
-                    }
-                default:
-                    throw new RequestFailedException(message.Response);
-            }
-        }
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpDiagnosticCollection.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpDiagnosticCollection.cs
index 88fae3be9eca..8d1ccf52b47f 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpDiagnosticCollection.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpDiagnosticCollection.cs
@@ -8,8 +8,10 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
+using Azure;
 using Azure.Core;
 using Azure.Core.Pipeline;
+using Azure.ResourceManager;
 
 namespace Azure.ResourceManager.SelfHelp
 {
@@ -20,42 +22,38 @@ namespace Azure.ResourceManager.SelfHelp
     /// </summary>
     public partial class SelfHelpDiagnosticCollection : ArmCollection
     {
-        private readonly ClientDiagnostics _selfHelpDiagnosticDiagnosticResourcesClientDiagnostics;
-        private readonly DiagnosticResourcesRestOperations _selfHelpDiagnosticDiagnosticResourcesRestClient;
+        private readonly ClientDiagnostics _diagnosticResourcesClientDiagnostics;
+        private readonly DiagnosticResources _diagnosticResourcesRestClient;
 
-        /// <summary> Initializes a new instance of the <see cref="SelfHelpDiagnosticCollection"/> class for mocking. </summary>
+        /// <summary> Initializes a new instance of SelfHelpDiagnosticCollection for mocking. </summary>
         protected SelfHelpDiagnosticCollection()
         {
         }
 
-        /// <summary> Initializes a new instance of the <see cref="SelfHelpDiagnosticCollection"/> class. </summary>
+        /// <summary> Initializes a new instance of <see cref="SelfHelpDiagnosticCollection"/> class. </summary>
         /// <param name="client"> The client parameters to use in these operations. </param>
-        /// <param name="id"> The identifier of the parent resource that is the target of operations. </param>
+        /// <param name="id"> The identifier of the resource that is the target of operations. </param>
         internal SelfHelpDiagnosticCollection(ArmClient client, ResourceIdentifier id) : base(client, id)
         {
-            _selfHelpDiagnosticDiagnosticResourcesClientDiagnostics = new ClientDiagnostics("Azure.ResourceManager.SelfHelp", SelfHelpDiagnosticResource.ResourceType.Namespace, Diagnostics);
-            TryGetApiVersion(SelfHelpDiagnosticResource.ResourceType, out string selfHelpDiagnosticDiagnosticResourcesApiVersion);
-            _selfHelpDiagnosticDiagnosticResourcesRestClient = new DiagnosticResourcesRestOperations(Pipeline, Diagnostics.ApplicationId, Endpoint, selfHelpDiagnosticDiagnosticResourcesApiVersion);
+            TryGetApiVersion(SelfHelpDiagnosticResource.ResourceType, out string selfHelpDiagnosticApiVersion);
+            _diagnosticResourcesClientDiagnostics = new ClientDiagnostics("Azure.ResourceManager.SelfHelp", SelfHelpDiagnosticResource.ResourceType.Namespace, Diagnostics);
+            _diagnosticResourcesRestClient = new DiagnosticResources(_diagnosticResourcesClientDiagnostics, Pipeline, Endpoint, selfHelpDiagnosticApiVersion ?? "2024-03-01-preview");
         }
 
         /// <summary>
         /// Creates a diagnostic for the specific resource using solutionId from discovery solutions. &lt;br/&gt;Diagnostics are powerful solutions that access product resources or other relevant data and provide the root cause of the issue and the steps to address the issue.&lt;br/&gt;&lt;br/&gt;
         /// <list type="bullet">
         /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/diagnostics/{diagnosticsResourceName}</description>
+        /// <term> Request Path. </term>
+        /// <description> /{scope}/providers/Microsoft.Help/diagnostics/{diagnosticsResourceName}. </description>
         /// </item>
         /// <item>
-        /// <term>Operation Id</term>
-        /// <description>DiagnosticResource_Create</description>
+        /// <term> Operation Id. </term>
+        /// <description> DiagnosticResources_Create. </description>
         /// </item>
         /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
-        /// </item>
-        /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpDiagnosticResource"/></description>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
         /// </item>
         /// </list>
         /// </summary>
@@ -63,21 +61,33 @@ internal SelfHelpDiagnosticCollection(ArmClient client, ResourceIdentifier id) :
         /// <param name="diagnosticsResourceName"> Unique resource name for insight resources. </param>
         /// <param name="data"> The required request body for this insightResource invocation. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="diagnosticsResourceName"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="diagnosticsResourceName"/> is an empty string, and was expected to be non-empty. </exception>
-        /// <exception cref="ArgumentNullException"> <paramref name="diagnosticsResourceName"/> or <paramref name="data"/> is null. </exception>
-        public virtual async Task<ArmOperation<SelfHelpDiagnosticResource>> CreateOrUpdateAsync(WaitUntil waitUntil, string diagnosticsResourceName, SelfHelpDiagnosticData data, CancellationToken cancellationToken = default)
+        public virtual async Task<ArmOperation<SelfHelpDiagnosticResource>> CreateOrUpdateAsync(WaitUntil waitUntil, string diagnosticsResourceName, SelfHelpDiagnosticData data = default, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(diagnosticsResourceName, nameof(diagnosticsResourceName));
-            Argument.AssertNotNull(data, nameof(data));
 
-            using var scope = _selfHelpDiagnosticDiagnosticResourcesClientDiagnostics.CreateScope("SelfHelpDiagnosticCollection.CreateOrUpdate");
+            using DiagnosticScope scope = _diagnosticResourcesClientDiagnostics.CreateScope("SelfHelpDiagnosticCollection.CreateOrUpdate");
             scope.Start();
             try
             {
-                var response = await _selfHelpDiagnosticDiagnosticResourcesRestClient.CreateAsync(Id, diagnosticsResourceName, data, cancellationToken).ConfigureAwait(false);
-                var operation = new SelfHelpArmOperation<SelfHelpDiagnosticResource>(new SelfHelpDiagnosticOperationSource(Client), _selfHelpDiagnosticDiagnosticResourcesClientDiagnostics, Pipeline, _selfHelpDiagnosticDiagnosticResourcesRestClient.CreateCreateRequest(Id, diagnosticsResourceName, data).Request, response, OperationFinalStateVia.AzureAsyncOperation);
+                RequestContext context = new RequestContext
+                {
+                    CancellationToken = cancellationToken
+                };
+                HttpMessage message = _diagnosticResourcesRestClient.CreateCreateRequest(Id, diagnosticsResourceName, SelfHelpDiagnosticData.ToRequestContent(data), context);
+                Response response = await Pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
+                SelfHelpArmOperation<SelfHelpDiagnosticResource> operation = new SelfHelpArmOperation<SelfHelpDiagnosticResource>(
+                    new SelfHelpDiagnosticOperationSource(Client),
+                    _diagnosticResourcesClientDiagnostics,
+                    Pipeline,
+                    message.Request,
+                    response,
+                    OperationFinalStateVia.AzureAsyncOperation);
                 if (waitUntil == WaitUntil.Completed)
+                {
                     await operation.WaitForCompletionAsync(cancellationToken).ConfigureAwait(false);
+                }
                 return operation;
             }
             catch (Exception e)
@@ -91,20 +101,16 @@ public virtual async Task<ArmOperation<SelfHelpDiagnosticResource>> CreateOrUpda
         /// Creates a diagnostic for the specific resource using solutionId from discovery solutions. &lt;br/&gt;Diagnostics are powerful solutions that access product resources or other relevant data and provide the root cause of the issue and the steps to address the issue.&lt;br/&gt;&lt;br/&gt;
         /// <list type="bullet">
         /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/diagnostics/{diagnosticsResourceName}</description>
-        /// </item>
-        /// <item>
-        /// <term>Operation Id</term>
-        /// <description>DiagnosticResource_Create</description>
+        /// <term> Request Path. </term>
+        /// <description> /{scope}/providers/Microsoft.Help/diagnostics/{diagnosticsResourceName}. </description>
         /// </item>
         /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
+        /// <term> Operation Id. </term>
+        /// <description> DiagnosticResources_Create. </description>
         /// </item>
         /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpDiagnosticResource"/></description>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
         /// </item>
         /// </list>
         /// </summary>
@@ -112,21 +118,33 @@ public virtual async Task<ArmOperation<SelfHelpDiagnosticResource>> CreateOrUpda
         /// <param name="diagnosticsResourceName"> Unique resource name for insight resources. </param>
         /// <param name="data"> The required request body for this insightResource invocation. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="diagnosticsResourceName"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="diagnosticsResourceName"/> is an empty string, and was expected to be non-empty. </exception>
-        /// <exception cref="ArgumentNullException"> <paramref name="diagnosticsResourceName"/> or <paramref name="data"/> is null. </exception>
-        public virtual ArmOperation<SelfHelpDiagnosticResource> CreateOrUpdate(WaitUntil waitUntil, string diagnosticsResourceName, SelfHelpDiagnosticData data, CancellationToken cancellationToken = default)
+        public virtual ArmOperation<SelfHelpDiagnosticResource> CreateOrUpdate(WaitUntil waitUntil, string diagnosticsResourceName, SelfHelpDiagnosticData data = default, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(diagnosticsResourceName, nameof(diagnosticsResourceName));
-            Argument.AssertNotNull(data, nameof(data));
 
-            using var scope = _selfHelpDiagnosticDiagnosticResourcesClientDiagnostics.CreateScope("SelfHelpDiagnosticCollection.CreateOrUpdate");
+            using DiagnosticScope scope = _diagnosticResourcesClientDiagnostics.CreateScope("SelfHelpDiagnosticCollection.CreateOrUpdate");
             scope.Start();
             try
             {
-                var response = _selfHelpDiagnosticDiagnosticResourcesRestClient.Create(Id, diagnosticsResourceName, data, cancellationToken);
-                var operation = new SelfHelpArmOperation<SelfHelpDiagnosticResource>(new SelfHelpDiagnosticOperationSource(Client), _selfHelpDiagnosticDiagnosticResourcesClientDiagnostics, Pipeline, _selfHelpDiagnosticDiagnosticResourcesRestClient.CreateCreateRequest(Id, diagnosticsResourceName, data).Request, response, OperationFinalStateVia.AzureAsyncOperation);
+                RequestContext context = new RequestContext
+                {
+                    CancellationToken = cancellationToken
+                };
+                HttpMessage message = _diagnosticResourcesRestClient.CreateCreateRequest(Id, diagnosticsResourceName, SelfHelpDiagnosticData.ToRequestContent(data), context);
+                Response response = Pipeline.ProcessMessage(message, context);
+                SelfHelpArmOperation<SelfHelpDiagnosticResource> operation = new SelfHelpArmOperation<SelfHelpDiagnosticResource>(
+                    new SelfHelpDiagnosticOperationSource(Client),
+                    _diagnosticResourcesClientDiagnostics,
+                    Pipeline,
+                    message.Request,
+                    response,
+                    OperationFinalStateVia.AzureAsyncOperation);
                 if (waitUntil == WaitUntil.Completed)
+                {
                     operation.WaitForCompletion(cancellationToken);
+                }
                 return operation;
             }
             catch (Exception e)
@@ -140,38 +158,42 @@ public virtual ArmOperation<SelfHelpDiagnosticResource> CreateOrUpdate(WaitUntil
         /// Get the diagnostics using the 'diagnosticsResourceName' you chose while creating the diagnostic.
         /// <list type="bullet">
         /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/diagnostics/{diagnosticsResourceName}</description>
-        /// </item>
-        /// <item>
-        /// <term>Operation Id</term>
-        /// <description>DiagnosticResource_Get</description>
+        /// <term> Request Path. </term>
+        /// <description> /{scope}/providers/Microsoft.Help/diagnostics/{diagnosticsResourceName}. </description>
         /// </item>
         /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
+        /// <term> Operation Id. </term>
+        /// <description> DiagnosticResources_Get. </description>
         /// </item>
         /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpDiagnosticResource"/></description>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="diagnosticsResourceName"> Unique resource name for insight resources. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentException"> <paramref name="diagnosticsResourceName"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="ArgumentNullException"> <paramref name="diagnosticsResourceName"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="diagnosticsResourceName"/> is an empty string, and was expected to be non-empty. </exception>
         public virtual async Task<Response<SelfHelpDiagnosticResource>> GetAsync(string diagnosticsResourceName, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(diagnosticsResourceName, nameof(diagnosticsResourceName));
 
-            using var scope = _selfHelpDiagnosticDiagnosticResourcesClientDiagnostics.CreateScope("SelfHelpDiagnosticCollection.Get");
+            using DiagnosticScope scope = _diagnosticResourcesClientDiagnostics.CreateScope("SelfHelpDiagnosticCollection.Get");
             scope.Start();
             try
             {
-                var response = await _selfHelpDiagnosticDiagnosticResourcesRestClient.GetAsync(Id, diagnosticsResourceName, cancellationToken).ConfigureAwait(false);
+                RequestContext context = new RequestContext
+                {
+                    CancellationToken = cancellationToken
+                };
+                HttpMessage message = _diagnosticResourcesRestClient.CreateGetRequest(Id, diagnosticsResourceName, context);
+                Response result = await Pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
+                Response<SelfHelpDiagnosticData> response = Response.FromValue(SelfHelpDiagnosticData.FromResponse(result), result);
                 if (response.Value == null)
+                {
                     throw new RequestFailedException(response.GetRawResponse());
+                }
                 return Response.FromValue(new SelfHelpDiagnosticResource(Client, response.Value), response.GetRawResponse());
             }
             catch (Exception e)
@@ -185,38 +207,42 @@ public virtual async Task<Response<SelfHelpDiagnosticResource>> GetAsync(string
         /// Get the diagnostics using the 'diagnosticsResourceName' you chose while creating the diagnostic.
         /// <list type="bullet">
         /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/diagnostics/{diagnosticsResourceName}</description>
-        /// </item>
-        /// <item>
-        /// <term>Operation Id</term>
-        /// <description>DiagnosticResource_Get</description>
+        /// <term> Request Path. </term>
+        /// <description> /{scope}/providers/Microsoft.Help/diagnostics/{diagnosticsResourceName}. </description>
         /// </item>
         /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
+        /// <term> Operation Id. </term>
+        /// <description> DiagnosticResources_Get. </description>
         /// </item>
         /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpDiagnosticResource"/></description>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="diagnosticsResourceName"> Unique resource name for insight resources. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentException"> <paramref name="diagnosticsResourceName"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="ArgumentNullException"> <paramref name="diagnosticsResourceName"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="diagnosticsResourceName"/> is an empty string, and was expected to be non-empty. </exception>
         public virtual Response<SelfHelpDiagnosticResource> Get(string diagnosticsResourceName, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(diagnosticsResourceName, nameof(diagnosticsResourceName));
 
-            using var scope = _selfHelpDiagnosticDiagnosticResourcesClientDiagnostics.CreateScope("SelfHelpDiagnosticCollection.Get");
+            using DiagnosticScope scope = _diagnosticResourcesClientDiagnostics.CreateScope("SelfHelpDiagnosticCollection.Get");
             scope.Start();
             try
             {
-                var response = _selfHelpDiagnosticDiagnosticResourcesRestClient.Get(Id, diagnosticsResourceName, cancellationToken);
+                RequestContext context = new RequestContext
+                {
+                    CancellationToken = cancellationToken
+                };
+                HttpMessage message = _diagnosticResourcesRestClient.CreateGetRequest(Id, diagnosticsResourceName, context);
+                Response result = Pipeline.ProcessMessage(message, context);
+                Response<SelfHelpDiagnosticData> response = Response.FromValue(SelfHelpDiagnosticData.FromResponse(result), result);
                 if (response.Value == null)
+                {
                     throw new RequestFailedException(response.GetRawResponse());
+                }
                 return Response.FromValue(new SelfHelpDiagnosticResource(Client, response.Value), response.GetRawResponse());
             }
             catch (Exception e)
@@ -227,39 +253,53 @@ public virtual Response<SelfHelpDiagnosticResource> Get(string diagnosticsResour
         }
 
         /// <summary>
-        /// Checks to see if the resource exists in azure.
+        /// Get the diagnostics using the 'diagnosticsResourceName' you chose while creating the diagnostic.
         /// <list type="bullet">
         /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/diagnostics/{diagnosticsResourceName}</description>
-        /// </item>
-        /// <item>
-        /// <term>Operation Id</term>
-        /// <description>DiagnosticResource_Get</description>
+        /// <term> Request Path. </term>
+        /// <description> /{scope}/providers/Microsoft.Help/diagnostics/{diagnosticsResourceName}. </description>
         /// </item>
         /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
+        /// <term> Operation Id. </term>
+        /// <description> DiagnosticResources_Get. </description>
         /// </item>
         /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpDiagnosticResource"/></description>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="diagnosticsResourceName"> Unique resource name for insight resources. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentException"> <paramref name="diagnosticsResourceName"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="ArgumentNullException"> <paramref name="diagnosticsResourceName"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="diagnosticsResourceName"/> is an empty string, and was expected to be non-empty. </exception>
         public virtual async Task<Response<bool>> ExistsAsync(string diagnosticsResourceName, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(diagnosticsResourceName, nameof(diagnosticsResourceName));
 
-            using var scope = _selfHelpDiagnosticDiagnosticResourcesClientDiagnostics.CreateScope("SelfHelpDiagnosticCollection.Exists");
+            using DiagnosticScope scope = _diagnosticResourcesClientDiagnostics.CreateScope("SelfHelpDiagnosticCollection.Exists");
             scope.Start();
             try
             {
-                var response = await _selfHelpDiagnosticDiagnosticResourcesRestClient.GetAsync(Id, diagnosticsResourceName, cancellationToken: cancellationToken).ConfigureAwait(false);
+                RequestContext context = new RequestContext
+                {
+                    CancellationToken = cancellationToken
+                };
+                HttpMessage message = _diagnosticResourcesRestClient.CreateGetRequest(Id, diagnosticsResourceName, context);
+                await Pipeline.SendAsync(message, context.CancellationToken).ConfigureAwait(false);
+                Response result = message.Response;
+                Response<SelfHelpDiagnosticData> response = default;
+                switch (result.Status)
+                {
+                    case 200:
+                        response = Response.FromValue(SelfHelpDiagnosticData.FromResponse(result), result);
+                        break;
+                    case 404:
+                        response = Response.FromValue((SelfHelpDiagnosticData)null, result);
+                        break;
+                    default:
+                        throw new RequestFailedException(result);
+                }
                 return Response.FromValue(response.Value != null, response.GetRawResponse());
             }
             catch (Exception e)
@@ -270,39 +310,53 @@ public virtual async Task<Response<bool>> ExistsAsync(string diagnosticsResource
         }
 
         /// <summary>
-        /// Checks to see if the resource exists in azure.
+        /// Get the diagnostics using the 'diagnosticsResourceName' you chose while creating the diagnostic.
         /// <list type="bullet">
         /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/diagnostics/{diagnosticsResourceName}</description>
-        /// </item>
-        /// <item>
-        /// <term>Operation Id</term>
-        /// <description>DiagnosticResource_Get</description>
+        /// <term> Request Path. </term>
+        /// <description> /{scope}/providers/Microsoft.Help/diagnostics/{diagnosticsResourceName}. </description>
         /// </item>
         /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
+        /// <term> Operation Id. </term>
+        /// <description> DiagnosticResources_Get. </description>
         /// </item>
         /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpDiagnosticResource"/></description>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="diagnosticsResourceName"> Unique resource name for insight resources. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentException"> <paramref name="diagnosticsResourceName"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="ArgumentNullException"> <paramref name="diagnosticsResourceName"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="diagnosticsResourceName"/> is an empty string, and was expected to be non-empty. </exception>
         public virtual Response<bool> Exists(string diagnosticsResourceName, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(diagnosticsResourceName, nameof(diagnosticsResourceName));
 
-            using var scope = _selfHelpDiagnosticDiagnosticResourcesClientDiagnostics.CreateScope("SelfHelpDiagnosticCollection.Exists");
+            using DiagnosticScope scope = _diagnosticResourcesClientDiagnostics.CreateScope("SelfHelpDiagnosticCollection.Exists");
             scope.Start();
             try
             {
-                var response = _selfHelpDiagnosticDiagnosticResourcesRestClient.Get(Id, diagnosticsResourceName, cancellationToken: cancellationToken);
+                RequestContext context = new RequestContext
+                {
+                    CancellationToken = cancellationToken
+                };
+                HttpMessage message = _diagnosticResourcesRestClient.CreateGetRequest(Id, diagnosticsResourceName, context);
+                Pipeline.Send(message, context.CancellationToken);
+                Response result = message.Response;
+                Response<SelfHelpDiagnosticData> response = default;
+                switch (result.Status)
+                {
+                    case 200:
+                        response = Response.FromValue(SelfHelpDiagnosticData.FromResponse(result), result);
+                        break;
+                    case 404:
+                        response = Response.FromValue((SelfHelpDiagnosticData)null, result);
+                        break;
+                    default:
+                        throw new RequestFailedException(result);
+                }
                 return Response.FromValue(response.Value != null, response.GetRawResponse());
             }
             catch (Exception e)
@@ -313,41 +367,57 @@ public virtual Response<bool> Exists(string diagnosticsResourceName, Cancellatio
         }
 
         /// <summary>
-        /// Tries to get details for this resource from the service.
+        /// Get the diagnostics using the 'diagnosticsResourceName' you chose while creating the diagnostic.
         /// <list type="bullet">
         /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/diagnostics/{diagnosticsResourceName}</description>
+        /// <term> Request Path. </term>
+        /// <description> /{scope}/providers/Microsoft.Help/diagnostics/{diagnosticsResourceName}. </description>
         /// </item>
         /// <item>
-        /// <term>Operation Id</term>
-        /// <description>DiagnosticResource_Get</description>
+        /// <term> Operation Id. </term>
+        /// <description> DiagnosticResources_Get. </description>
         /// </item>
         /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
-        /// </item>
-        /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpDiagnosticResource"/></description>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="diagnosticsResourceName"> Unique resource name for insight resources. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentException"> <paramref name="diagnosticsResourceName"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="ArgumentNullException"> <paramref name="diagnosticsResourceName"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="diagnosticsResourceName"/> is an empty string, and was expected to be non-empty. </exception>
         public virtual async Task<NullableResponse<SelfHelpDiagnosticResource>> GetIfExistsAsync(string diagnosticsResourceName, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(diagnosticsResourceName, nameof(diagnosticsResourceName));
 
-            using var scope = _selfHelpDiagnosticDiagnosticResourcesClientDiagnostics.CreateScope("SelfHelpDiagnosticCollection.GetIfExists");
+            using DiagnosticScope scope = _diagnosticResourcesClientDiagnostics.CreateScope("SelfHelpDiagnosticCollection.GetIfExists");
             scope.Start();
             try
             {
-                var response = await _selfHelpDiagnosticDiagnosticResourcesRestClient.GetAsync(Id, diagnosticsResourceName, cancellationToken: cancellationToken).ConfigureAwait(false);
+                RequestContext context = new RequestContext
+                {
+                    CancellationToken = cancellationToken
+                };
+                HttpMessage message = _diagnosticResourcesRestClient.CreateGetRequest(Id, diagnosticsResourceName, context);
+                await Pipeline.SendAsync(message, context.CancellationToken).ConfigureAwait(false);
+                Response result = message.Response;
+                Response<SelfHelpDiagnosticData> response = default;
+                switch (result.Status)
+                {
+                    case 200:
+                        response = Response.FromValue(SelfHelpDiagnosticData.FromResponse(result), result);
+                        break;
+                    case 404:
+                        response = Response.FromValue((SelfHelpDiagnosticData)null, result);
+                        break;
+                    default:
+                        throw new RequestFailedException(result);
+                }
                 if (response.Value == null)
+                {
                     return new NoValueResponse<SelfHelpDiagnosticResource>(response.GetRawResponse());
+                }
                 return Response.FromValue(new SelfHelpDiagnosticResource(Client, response.Value), response.GetRawResponse());
             }
             catch (Exception e)
@@ -358,41 +428,57 @@ public virtual async Task<NullableResponse<SelfHelpDiagnosticResource>> GetIfExi
         }
 
         /// <summary>
-        /// Tries to get details for this resource from the service.
+        /// Get the diagnostics using the 'diagnosticsResourceName' you chose while creating the diagnostic.
         /// <list type="bullet">
         /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/diagnostics/{diagnosticsResourceName}</description>
+        /// <term> Request Path. </term>
+        /// <description> /{scope}/providers/Microsoft.Help/diagnostics/{diagnosticsResourceName}. </description>
         /// </item>
         /// <item>
-        /// <term>Operation Id</term>
-        /// <description>DiagnosticResource_Get</description>
+        /// <term> Operation Id. </term>
+        /// <description> DiagnosticResources_Get. </description>
         /// </item>
         /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
-        /// </item>
-        /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpDiagnosticResource"/></description>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="diagnosticsResourceName"> Unique resource name for insight resources. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentException"> <paramref name="diagnosticsResourceName"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="ArgumentNullException"> <paramref name="diagnosticsResourceName"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="diagnosticsResourceName"/> is an empty string, and was expected to be non-empty. </exception>
         public virtual NullableResponse<SelfHelpDiagnosticResource> GetIfExists(string diagnosticsResourceName, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(diagnosticsResourceName, nameof(diagnosticsResourceName));
 
-            using var scope = _selfHelpDiagnosticDiagnosticResourcesClientDiagnostics.CreateScope("SelfHelpDiagnosticCollection.GetIfExists");
+            using DiagnosticScope scope = _diagnosticResourcesClientDiagnostics.CreateScope("SelfHelpDiagnosticCollection.GetIfExists");
             scope.Start();
             try
             {
-                var response = _selfHelpDiagnosticDiagnosticResourcesRestClient.Get(Id, diagnosticsResourceName, cancellationToken: cancellationToken);
+                RequestContext context = new RequestContext
+                {
+                    CancellationToken = cancellationToken
+                };
+                HttpMessage message = _diagnosticResourcesRestClient.CreateGetRequest(Id, diagnosticsResourceName, context);
+                Pipeline.Send(message, context.CancellationToken);
+                Response result = message.Response;
+                Response<SelfHelpDiagnosticData> response = default;
+                switch (result.Status)
+                {
+                    case 200:
+                        response = Response.FromValue(SelfHelpDiagnosticData.FromResponse(result), result);
+                        break;
+                    case 404:
+                        response = Response.FromValue((SelfHelpDiagnosticData)null, result);
+                        break;
+                    default:
+                        throw new RequestFailedException(result);
+                }
                 if (response.Value == null)
+                {
                     return new NoValueResponse<SelfHelpDiagnosticResource>(response.GetRawResponse());
+                }
                 return Response.FromValue(new SelfHelpDiagnosticResource(Client, response.Value), response.GetRawResponse());
             }
             catch (Exception e)
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpDiagnosticData.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpDiagnosticData.Serialization.cs
index a9e661091030..5c81f7e79bc5 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpDiagnosticData.Serialization.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpDiagnosticData.Serialization.cs
@@ -10,16 +10,18 @@
 using System.Collections.Generic;
 using System.Text;
 using System.Text.Json;
+using Azure;
 using Azure.Core;
 using Azure.ResourceManager.Models;
 using Azure.ResourceManager.SelfHelp.Models;
 
 namespace Azure.ResourceManager.SelfHelp
 {
-    public partial class SelfHelpDiagnosticData : IUtf8JsonSerializable, IJsonModel<SelfHelpDiagnosticData>
+    /// <summary> Diagnostic resource. </summary>
+    public partial class SelfHelpDiagnosticData : ResourceData, IJsonModel<SelfHelpDiagnosticData>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<SelfHelpDiagnosticData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
+        /// <param name="writer"> The JSON writer. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
         void IJsonModel<SelfHelpDiagnosticData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
@@ -31,211 +33,114 @@ void IJsonModel<SelfHelpDiagnosticData>.Write(Utf8JsonWriter writer, ModelReader
         /// <param name="options"> The client options for reading and writing models. </param>
         protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpDiagnosticData>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpDiagnosticData>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(SelfHelpDiagnosticData)} does not support writing '{format}' format.");
             }
-
             base.JsonModelWriteCore(writer, options);
-            writer.WritePropertyName("properties"u8);
-            writer.WriteStartObject();
-            if (Optional.IsCollectionDefined(GlobalParameters))
-            {
-                writer.WritePropertyName("globalParameters"u8);
-                writer.WriteStartObject();
-                foreach (var item in GlobalParameters)
-                {
-                    writer.WritePropertyName(item.Key);
-                    writer.WriteStringValue(item.Value);
-                }
-                writer.WriteEndObject();
-            }
-            if (Optional.IsCollectionDefined(Insights))
-            {
-                writer.WritePropertyName("insights"u8);
-                writer.WriteStartArray();
-                foreach (var item in Insights)
-                {
-                    writer.WriteObjectValue(item, options);
-                }
-                writer.WriteEndArray();
-            }
-            if (options.Format != "W" && Optional.IsDefined(AcceptedOn))
+            if (Optional.IsDefined(Properties))
             {
-                writer.WritePropertyName("acceptedAt"u8);
-                writer.WriteStringValue(AcceptedOn.Value, "O");
+                writer.WritePropertyName("properties"u8);
+                writer.WriteObjectValue(Properties, options);
             }
-            if (options.Format != "W" && Optional.IsDefined(ProvisioningState))
-            {
-                writer.WritePropertyName("provisioningState"u8);
-                writer.WriteStringValue(ProvisioningState.Value.ToString());
-            }
-            if (options.Format != "W" && Optional.IsCollectionDefined(Diagnostics))
-            {
-                writer.WritePropertyName("diagnostics"u8);
-                writer.WriteStartArray();
-                foreach (var item in Diagnostics)
-                {
-                    writer.WriteObjectValue(item, options);
-                }
-                writer.WriteEndArray();
-            }
-            writer.WriteEndObject();
         }
 
-        SelfHelpDiagnosticData IJsonModel<SelfHelpDiagnosticData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        SelfHelpDiagnosticData IJsonModel<SelfHelpDiagnosticData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => (SelfHelpDiagnosticData)JsonModelCreateCore(ref reader, options);
+
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual ResourceData JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpDiagnosticData>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpDiagnosticData>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(SelfHelpDiagnosticData)} does not support reading '{format}' format.");
             }
-
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
             return DeserializeSelfHelpDiagnosticData(document.RootElement, options);
         }
 
-        internal static SelfHelpDiagnosticData DeserializeSelfHelpDiagnosticData(JsonElement element, ModelReaderWriterOptions options = null)
+        /// <param name="element"> The JSON element to deserialize. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        internal static SelfHelpDiagnosticData DeserializeSelfHelpDiagnosticData(JsonElement element, ModelReaderWriterOptions options)
         {
-            options ??= ModelSerializationExtensions.WireOptions;
-
             if (element.ValueKind == JsonValueKind.Null)
             {
                 return null;
             }
             ResourceIdentifier id = default;
             string name = default;
-            ResourceType type = default;
+            ResourceType resourceType = default;
             SystemData systemData = default;
-            IDictionary<string, string> globalParameters = default;
-            IList<SelfHelpDiagnosticInvocation> insights = default;
-            DateTimeOffset? acceptedAt = default;
-            SelfHelpProvisioningState? provisioningState = default;
-            IReadOnlyList<SelfHelpDiagnosticInfo> diagnostics = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
+            IDictionary<string, BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            SelfHelpDiagnosticResourceProperties properties = default;
+            foreach (var prop in element.EnumerateObject())
             {
-                if (property.NameEquals("id"u8))
+                if (prop.NameEquals("id"u8))
                 {
-                    id = new ResourceIdentifier(property.Value.GetString());
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    id = new ResourceIdentifier(prop.Value.GetString());
                     continue;
                 }
-                if (property.NameEquals("name"u8))
+                if (prop.NameEquals("name"u8))
                 {
-                    name = property.Value.GetString();
+                    name = prop.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("type"u8))
+                if (prop.NameEquals("type"u8))
                 {
-                    type = new ResourceType(property.Value.GetString());
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    resourceType = new ResourceType(prop.Value.GetString());
                     continue;
                 }
-                if (property.NameEquals("systemData"u8))
+                if (prop.NameEquals("systemData"u8))
                 {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
-                    systemData = ModelReaderWriter.Read<SystemData>(new BinaryData(Encoding.UTF8.GetBytes(property.Value.GetRawText())), ModelSerializationExtensions.WireOptions, AzureResourceManagerSelfHelpContext.Default);
+                    systemData = ModelReaderWriter.Read<SystemData>(new BinaryData(Encoding.UTF8.GetBytes(prop.Value.GetRawText())), ModelSerializationExtensions.WireOptions, AzureResourceManagerSelfHelpContext.Default);
                     continue;
                 }
-                if (property.NameEquals("properties"u8))
+                if (prop.NameEquals("properties"u8))
                 {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
-                        property.ThrowNonNullablePropertyIsNull();
                         continue;
                     }
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        if (property0.NameEquals("globalParameters"u8))
-                        {
-                            if (property0.Value.ValueKind == JsonValueKind.Null)
-                            {
-                                continue;
-                            }
-                            Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                            foreach (var property1 in property0.Value.EnumerateObject())
-                            {
-                                dictionary.Add(property1.Name, property1.Value.GetString());
-                            }
-                            globalParameters = dictionary;
-                            continue;
-                        }
-                        if (property0.NameEquals("insights"u8))
-                        {
-                            if (property0.Value.ValueKind == JsonValueKind.Null)
-                            {
-                                continue;
-                            }
-                            List<SelfHelpDiagnosticInvocation> array = new List<SelfHelpDiagnosticInvocation>();
-                            foreach (var item in property0.Value.EnumerateArray())
-                            {
-                                array.Add(SelfHelpDiagnosticInvocation.DeserializeSelfHelpDiagnosticInvocation(item, options));
-                            }
-                            insights = array;
-                            continue;
-                        }
-                        if (property0.NameEquals("acceptedAt"u8))
-                        {
-                            if (property0.Value.ValueKind == JsonValueKind.Null)
-                            {
-                                continue;
-                            }
-                            acceptedAt = property0.Value.GetDateTimeOffset("O");
-                            continue;
-                        }
-                        if (property0.NameEquals("provisioningState"u8))
-                        {
-                            if (property0.Value.ValueKind == JsonValueKind.Null)
-                            {
-                                continue;
-                            }
-                            provisioningState = new SelfHelpProvisioningState(property0.Value.GetString());
-                            continue;
-                        }
-                        if (property0.NameEquals("diagnostics"u8))
-                        {
-                            if (property0.Value.ValueKind == JsonValueKind.Null)
-                            {
-                                continue;
-                            }
-                            List<SelfHelpDiagnosticInfo> array = new List<SelfHelpDiagnosticInfo>();
-                            foreach (var item in property0.Value.EnumerateArray())
-                            {
-                                array.Add(SelfHelpDiagnosticInfo.DeserializeSelfHelpDiagnosticInfo(item, options));
-                            }
-                            diagnostics = array;
-                            continue;
-                        }
-                    }
+                    properties = SelfHelpDiagnosticResourceProperties.DeserializeSelfHelpDiagnosticResourceProperties(prop.Value, options);
                     continue;
                 }
                 if (options.Format != "W")
                 {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                    additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText()));
                 }
             }
-            serializedAdditionalRawData = rawDataDictionary;
             return new SelfHelpDiagnosticData(
                 id,
                 name,
-                type,
+                resourceType,
                 systemData,
-                globalParameters ?? new ChangeTrackingDictionary<string, string>(),
-                insights ?? new ChangeTrackingList<SelfHelpDiagnosticInvocation>(),
-                acceptedAt,
-                provisioningState,
-                diagnostics ?? new ChangeTrackingList<SelfHelpDiagnosticInfo>(),
-                serializedAdditionalRawData);
+                additionalBinaryDataProperties,
+                properties);
         }
 
-        BinaryData IPersistableModel<SelfHelpDiagnosticData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpDiagnosticData>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="options"> The client options for reading and writing models. </param>
+        BinaryData IPersistableModel<SelfHelpDiagnosticData>.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
 
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpDiagnosticData>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
@@ -245,15 +150,20 @@ BinaryData IPersistableModel<SelfHelpDiagnosticData>.Write(ModelReaderWriterOpti
             }
         }
 
-        SelfHelpDiagnosticData IPersistableModel<SelfHelpDiagnosticData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpDiagnosticData>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        SelfHelpDiagnosticData IPersistableModel<SelfHelpDiagnosticData>.Create(BinaryData data, ModelReaderWriterOptions options) => (SelfHelpDiagnosticData)PersistableModelCreateCore(data, options);
 
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual ResourceData PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpDiagnosticData>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
+                    using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
                     {
-                        using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
                         return DeserializeSelfHelpDiagnosticData(document.RootElement, options);
                     }
                 default:
@@ -261,6 +171,26 @@ SelfHelpDiagnosticData IPersistableModel<SelfHelpDiagnosticData>.Create(BinaryDa
             }
         }
 
+        /// <param name="options"> The client options for reading and writing models. </param>
         string IPersistableModel<SelfHelpDiagnosticData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <param name="selfHelpDiagnosticData"> The <see cref="SelfHelpDiagnosticData"/> to serialize into <see cref="RequestContent"/>. </param>
+        internal static RequestContent ToRequestContent(SelfHelpDiagnosticData selfHelpDiagnosticData)
+        {
+            if (selfHelpDiagnosticData == null)
+            {
+                return null;
+            }
+            Utf8JsonRequestContent content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(selfHelpDiagnosticData, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+
+        /// <param name="response"> The <see cref="Response"/> to deserialize the <see cref="SelfHelpDiagnosticData"/> from. </param>
+        internal static SelfHelpDiagnosticData FromResponse(Response response)
+        {
+            using JsonDocument document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions);
+            return DeserializeSelfHelpDiagnosticData(document.RootElement, ModelSerializationExtensions.WireOptions);
+        }
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpDiagnosticData.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpDiagnosticData.cs
index 217608b36a3c..3d5f9f70ba6c 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpDiagnosticData.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpDiagnosticData.cs
@@ -13,82 +13,88 @@
 
 namespace Azure.ResourceManager.SelfHelp
 {
-    /// <summary>
-    /// A class representing the SelfHelpDiagnostic data model.
-    /// Diagnostic resource
-    /// </summary>
+    /// <summary> Diagnostic resource. </summary>
     public partial class SelfHelpDiagnosticData : ResourceData
     {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+        /// <summary> Keeps track of any properties unknown to the library. </summary>
+        private protected readonly IDictionary<string, BinaryData> _additionalBinaryDataProperties;
 
         /// <summary> Initializes a new instance of <see cref="SelfHelpDiagnosticData"/>. </summary>
         public SelfHelpDiagnosticData()
         {
-            GlobalParameters = new ChangeTrackingDictionary<string, string>();
-            Insights = new ChangeTrackingList<SelfHelpDiagnosticInvocation>();
-            Diagnostics = new ChangeTrackingList<SelfHelpDiagnosticInfo>();
         }
 
         /// <summary> Initializes a new instance of <see cref="SelfHelpDiagnosticData"/>. </summary>
-        /// <param name="id"> The id. </param>
-        /// <param name="name"> The name. </param>
-        /// <param name="resourceType"> The resourceType. </param>
-        /// <param name="systemData"> The systemData. </param>
-        /// <param name="globalParameters"> Global parameters is an optional map which can be used to add key and  value to request body to improve the diagnostics results. </param>
-        /// <param name="insights"> SolutionIds that are needed to be invoked. </param>
-        /// <param name="acceptedOn"> Diagnostic Request Accepted time. </param>
-        /// <param name="provisioningState"> Status of diagnostic provisioning. </param>
-        /// <param name="diagnostics"> Array of Diagnostics. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal SelfHelpDiagnosticData(ResourceIdentifier id, string name, ResourceType resourceType, SystemData systemData, IDictionary<string, string> globalParameters, IList<SelfHelpDiagnosticInvocation> insights, DateTimeOffset? acceptedOn, SelfHelpProvisioningState? provisioningState, IReadOnlyList<SelfHelpDiagnosticInfo> diagnostics, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(id, name, resourceType, systemData)
+        /// <param name="id"> Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. </param>
+        /// <param name="name"> The name of the resource. </param>
+        /// <param name="resourceType"> The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts". </param>
+        /// <param name="systemData"> Azure Resource Manager metadata containing createdBy and modifiedBy information. </param>
+        /// <param name="additionalBinaryDataProperties"> Keeps track of any properties unknown to the library. </param>
+        /// <param name="properties"> Diagnostic Resource properties. </param>
+        internal SelfHelpDiagnosticData(ResourceIdentifier id, string name, ResourceType resourceType, SystemData systemData, IDictionary<string, BinaryData> additionalBinaryDataProperties, SelfHelpDiagnosticResourceProperties properties) : base(id, name, resourceType, systemData)
         {
-            GlobalParameters = globalParameters;
-            Insights = insights;
-            AcceptedOn = acceptedOn;
-            ProvisioningState = provisioningState;
-            Diagnostics = diagnostics;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
+            _additionalBinaryDataProperties = additionalBinaryDataProperties;
+            Properties = properties;
         }
 
+        /// <summary> Diagnostic Resource properties. </summary>
+        internal SelfHelpDiagnosticResourceProperties Properties { get; set; }
+
         /// <summary> Global parameters is an optional map which can be used to add key and  value to request body to improve the diagnostics results. </summary>
-        public IDictionary<string, string> GlobalParameters { get; }
+        public IDictionary<string, string> GlobalParameters
+        {
+            get
+            {
+                if (Properties is null)
+                {
+                    Properties = new SelfHelpDiagnosticResourceProperties();
+                }
+                return Properties.GlobalParameters;
+            }
+        }
+
         /// <summary> SolutionIds that are needed to be invoked. </summary>
-        public IList<SelfHelpDiagnosticInvocation> Insights { get; }
+        public IList<SelfHelpDiagnosticInvocation> Insights
+        {
+            get
+            {
+                if (Properties is null)
+                {
+                    Properties = new SelfHelpDiagnosticResourceProperties();
+                }
+                return Properties.Insights;
+            }
+        }
+
         /// <summary> Diagnostic Request Accepted time. </summary>
-        public DateTimeOffset? AcceptedOn { get; }
+        public DateTimeOffset? AcceptedOn
+        {
+            get
+            {
+                return Properties is null ? default : Properties.AcceptedOn;
+            }
+        }
+
         /// <summary> Status of diagnostic provisioning. </summary>
-        public SelfHelpProvisioningState? ProvisioningState { get; }
+        public SelfHelpProvisioningState? ProvisioningState
+        {
+            get
+            {
+                return Properties is null ? default : Properties.ProvisioningState;
+            }
+        }
+
         /// <summary> Array of Diagnostics. </summary>
-        public IReadOnlyList<SelfHelpDiagnosticInfo> Diagnostics { get; }
+        public IReadOnlyList<SelfHelpDiagnosticInfo> Diagnostics
+        {
+            get
+            {
+                if (Properties is null)
+                {
+                    Properties = new SelfHelpDiagnosticResourceProperties();
+                }
+                return Properties.Diagnostics;
+            }
+        }
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpDiagnosticResource.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpDiagnosticResource.Serialization.cs
index c785a62c113d..88b0d02a3434 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpDiagnosticResource.Serialization.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpDiagnosticResource.Serialization.cs
@@ -11,19 +11,29 @@
 
 namespace Azure.ResourceManager.SelfHelp
 {
+    /// <summary></summary>
     public partial class SelfHelpDiagnosticResource : IJsonModel<SelfHelpDiagnosticData>
     {
-        private static SelfHelpDiagnosticData s_dataDeserializationInstance;
-        private static SelfHelpDiagnosticData DataDeserializationInstance => s_dataDeserializationInstance ??= new();
+        private static IJsonModel<SelfHelpDiagnosticData> s_dataDeserializationInstance;
 
+        private static IJsonModel<SelfHelpDiagnosticData> DataDeserializationInstance => s_dataDeserializationInstance ??= new SelfHelpDiagnosticData();
+
+        /// <param name="writer"> The writer to serialize the model to. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
         void IJsonModel<SelfHelpDiagnosticData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => ((IJsonModel<SelfHelpDiagnosticData>)Data).Write(writer, options);
 
-        SelfHelpDiagnosticData IJsonModel<SelfHelpDiagnosticData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => ((IJsonModel<SelfHelpDiagnosticData>)DataDeserializationInstance).Create(ref reader, options);
+        /// <param name="reader"> The reader for deserializing the model. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        SelfHelpDiagnosticData IJsonModel<SelfHelpDiagnosticData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => DataDeserializationInstance.Create(ref reader, options);
 
+        /// <param name="options"> The client options for reading and writing models. </param>
         BinaryData IPersistableModel<SelfHelpDiagnosticData>.Write(ModelReaderWriterOptions options) => ModelReaderWriter.Write<SelfHelpDiagnosticData>(Data, options, AzureResourceManagerSelfHelpContext.Default);
 
+        /// <param name="data"> The binary data to be processed. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
         SelfHelpDiagnosticData IPersistableModel<SelfHelpDiagnosticData>.Create(BinaryData data, ModelReaderWriterOptions options) => ModelReaderWriter.Read<SelfHelpDiagnosticData>(data, options, AzureResourceManagerSelfHelpContext.Default);
 
-        string IPersistableModel<SelfHelpDiagnosticData>.GetFormatFromOptions(ModelReaderWriterOptions options) => ((IPersistableModel<SelfHelpDiagnosticData>)DataDeserializationInstance).GetFormatFromOptions(options);
+        /// <param name="options"> The client options for reading and writing models. </param>
+        string IPersistableModel<SelfHelpDiagnosticData>.GetFormatFromOptions(ModelReaderWriterOptions options) => DataDeserializationInstance.GetFormatFromOptions(options);
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpDiagnosticResource.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpDiagnosticResource.cs
index 255e004ca0c9..02c968aafb2c 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpDiagnosticResource.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpDiagnosticResource.cs
@@ -6,44 +6,35 @@
 #nullable disable
 
 using System;
-using System.Globalization;
+using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
+using Azure;
 using Azure.Core;
 using Azure.Core.Pipeline;
+using Azure.ResourceManager;
 
 namespace Azure.ResourceManager.SelfHelp
 {
     /// <summary>
-    /// A Class representing a SelfHelpDiagnostic along with the instance operations that can be performed on it.
-    /// If you have a <see cref="ResourceIdentifier"/> you can construct a <see cref="SelfHelpDiagnosticResource"/>
-    /// from an instance of <see cref="ArmClient"/> using the GetSelfHelpDiagnosticResource method.
-    /// Otherwise you can get one from its parent resource <see cref="ArmResource"/> using the GetSelfHelpDiagnostic method.
+    /// A class representing a SelfHelpDiagnostic along with the instance operations that can be performed on it.
+    /// If you have a <see cref="ResourceIdentifier"/> you can construct a <see cref="SelfHelpDiagnosticResource"/> from an instance of <see cref="ArmClient"/> using the GetResource method.
+    /// Otherwise you can get one from its parent resource <see cref="ArmResource"/> using the GetSelfHelpDiagnostics method.
     /// </summary>
     public partial class SelfHelpDiagnosticResource : ArmResource
     {
-        /// <summary> Generate the resource identifier of a <see cref="SelfHelpDiagnosticResource"/> instance. </summary>
-        /// <param name="scope"> The scope. </param>
-        /// <param name="diagnosticsResourceName"> The diagnosticsResourceName. </param>
-        public static ResourceIdentifier CreateResourceIdentifier(string scope, string diagnosticsResourceName)
-        {
-            var resourceId = $"{scope}/providers/Microsoft.Help/diagnostics/{diagnosticsResourceName}";
-            return new ResourceIdentifier(resourceId);
-        }
-
-        private readonly ClientDiagnostics _selfHelpDiagnosticDiagnosticResourcesClientDiagnostics;
-        private readonly DiagnosticResourcesRestOperations _selfHelpDiagnosticDiagnosticResourcesRestClient;
+        private readonly ClientDiagnostics _diagnosticResourcesClientDiagnostics;
+        private readonly DiagnosticResources _diagnosticResourcesRestClient;
         private readonly SelfHelpDiagnosticData _data;
-
         /// <summary> Gets the resource type for the operations. </summary>
         public static readonly ResourceType ResourceType = "Microsoft.Help/diagnostics";
 
-        /// <summary> Initializes a new instance of the <see cref="SelfHelpDiagnosticResource"/> class for mocking. </summary>
+        /// <summary> Initializes a new instance of SelfHelpDiagnosticResource for mocking. </summary>
         protected SelfHelpDiagnosticResource()
         {
         }
 
-        /// <summary> Initializes a new instance of the <see cref="SelfHelpDiagnosticResource"/> class. </summary>
+        /// <summary> Initializes a new instance of <see cref="SelfHelpDiagnosticResource"/> class. </summary>
         /// <param name="client"> The client parameters to use in these operations. </param>
         /// <param name="data"> The resource that is the target of operations. </param>
         internal SelfHelpDiagnosticResource(ArmClient client, SelfHelpDiagnosticData data) : this(client, data.Id)
@@ -52,71 +43,91 @@ internal SelfHelpDiagnosticResource(ArmClient client, SelfHelpDiagnosticData dat
             _data = data;
         }
 
-        /// <summary> Initializes a new instance of the <see cref="SelfHelpDiagnosticResource"/> class. </summary>
+        /// <summary> Initializes a new instance of <see cref="SelfHelpDiagnosticResource"/> class. </summary>
         /// <param name="client"> The client parameters to use in these operations. </param>
         /// <param name="id"> The identifier of the resource that is the target of operations. </param>
         internal SelfHelpDiagnosticResource(ArmClient client, ResourceIdentifier id) : base(client, id)
         {
-            _selfHelpDiagnosticDiagnosticResourcesClientDiagnostics = new ClientDiagnostics("Azure.ResourceManager.SelfHelp", ResourceType.Namespace, Diagnostics);
-            TryGetApiVersion(ResourceType, out string selfHelpDiagnosticDiagnosticResourcesApiVersion);
-            _selfHelpDiagnosticDiagnosticResourcesRestClient = new DiagnosticResourcesRestOperations(Pipeline, Diagnostics.ApplicationId, Endpoint, selfHelpDiagnosticDiagnosticResourcesApiVersion);
-#if DEBUG
-			ValidateResourceId(Id);
-#endif
+            TryGetApiVersion(ResourceType, out string selfHelpDiagnosticApiVersion);
+            _diagnosticResourcesClientDiagnostics = new ClientDiagnostics("Azure.ResourceManager.SelfHelp", ResourceType.Namespace, Diagnostics);
+            _diagnosticResourcesRestClient = new DiagnosticResources(_diagnosticResourcesClientDiagnostics, Pipeline, Endpoint, selfHelpDiagnosticApiVersion ?? "2024-03-01-preview");
+            ValidateResourceId(id);
         }
 
         /// <summary> Gets whether or not the current instance has data. </summary>
         public virtual bool HasData { get; }
 
         /// <summary> Gets the data representing this Feature. </summary>
-        /// <exception cref="InvalidOperationException"> Throws if there is no data loaded in the current instance. </exception>
         public virtual SelfHelpDiagnosticData Data
         {
             get
             {
                 if (!HasData)
+                {
                     throw new InvalidOperationException("The current instance does not have data, you must call Get first.");
+                }
                 return _data;
             }
         }
 
+        /// <summary> Generate the resource identifier for this resource. </summary>
+        /// <param name="scope"> The scope. </param>
+        /// <param name="diagnosticsResourceName"> The diagnosticsResourceName. </param>
+        public static ResourceIdentifier CreateResourceIdentifier(string scope, string diagnosticsResourceName)
+        {
+            string resourceId = $"{scope}/providers/Microsoft.Help/diagnostics/{diagnosticsResourceName}";
+            return new ResourceIdentifier(resourceId);
+        }
+
+        /// <param name="id"></param>
+        [Conditional("DEBUG")]
         internal static void ValidateResourceId(ResourceIdentifier id)
         {
             if (id.ResourceType != ResourceType)
-                throw new ArgumentException(string.Format(CultureInfo.CurrentCulture, "Invalid resource type {0} expected {1}", id.ResourceType, ResourceType), nameof(id));
+            {
+                throw new ArgumentException(string.Format("Invalid resource type {0} expected {1}", id.ResourceType, ResourceType), id);
+            }
         }
 
         /// <summary>
         /// Get the diagnostics using the 'diagnosticsResourceName' you chose while creating the diagnostic.
         /// <list type="bullet">
         /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/diagnostics/{diagnosticsResourceName}</description>
+        /// <term> Request Path. </term>
+        /// <description> /{scope}/providers/Microsoft.Help/diagnostics/{diagnosticsResourceName}. </description>
         /// </item>
         /// <item>
-        /// <term>Operation Id</term>
-        /// <description>DiagnosticResource_Get</description>
+        /// <term> Operation Id. </term>
+        /// <description> DiagnosticResources_Get. </description>
         /// </item>
         /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
         /// </item>
         /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpDiagnosticResource"/></description>
+        /// <term> Resource. </term>
+        /// <description> <see cref="SelfHelpDiagnosticResource"/>. </description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<SelfHelpDiagnosticResource>> GetAsync(CancellationToken cancellationToken = default)
         {
-            using var scope = _selfHelpDiagnosticDiagnosticResourcesClientDiagnostics.CreateScope("SelfHelpDiagnosticResource.Get");
+            using DiagnosticScope scope = _diagnosticResourcesClientDiagnostics.CreateScope("SelfHelpDiagnosticResource.Get");
             scope.Start();
             try
             {
-                var response = await _selfHelpDiagnosticDiagnosticResourcesRestClient.GetAsync(Id.Parent, Id.Name, cancellationToken).ConfigureAwait(false);
+                RequestContext context = new RequestContext
+                {
+                    CancellationToken = cancellationToken
+                };
+                HttpMessage message = _diagnosticResourcesRestClient.CreateGetRequest(Id.Parent, Id.Name, context);
+                Response result = await Pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
+                Response<SelfHelpDiagnosticData> response = Response.FromValue(SelfHelpDiagnosticData.FromResponse(result), result);
                 if (response.Value == null)
+                {
                     throw new RequestFailedException(response.GetRawResponse());
+                }
                 return Response.FromValue(new SelfHelpDiagnosticResource(Client, response.Value), response.GetRawResponse());
             }
             catch (Exception e)
@@ -130,33 +141,41 @@ public virtual async Task<Response<SelfHelpDiagnosticResource>> GetAsync(Cancell
         /// Get the diagnostics using the 'diagnosticsResourceName' you chose while creating the diagnostic.
         /// <list type="bullet">
         /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/diagnostics/{diagnosticsResourceName}</description>
+        /// <term> Request Path. </term>
+        /// <description> /{scope}/providers/Microsoft.Help/diagnostics/{diagnosticsResourceName}. </description>
         /// </item>
         /// <item>
-        /// <term>Operation Id</term>
-        /// <description>DiagnosticResource_Get</description>
+        /// <term> Operation Id. </term>
+        /// <description> DiagnosticResources_Get. </description>
         /// </item>
         /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
         /// </item>
         /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpDiagnosticResource"/></description>
+        /// <term> Resource. </term>
+        /// <description> <see cref="SelfHelpDiagnosticResource"/>. </description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<SelfHelpDiagnosticResource> Get(CancellationToken cancellationToken = default)
         {
-            using var scope = _selfHelpDiagnosticDiagnosticResourcesClientDiagnostics.CreateScope("SelfHelpDiagnosticResource.Get");
+            using DiagnosticScope scope = _diagnosticResourcesClientDiagnostics.CreateScope("SelfHelpDiagnosticResource.Get");
             scope.Start();
             try
             {
-                var response = _selfHelpDiagnosticDiagnosticResourcesRestClient.Get(Id.Parent, Id.Name, cancellationToken);
+                RequestContext context = new RequestContext
+                {
+                    CancellationToken = cancellationToken
+                };
+                HttpMessage message = _diagnosticResourcesRestClient.CreateGetRequest(Id.Parent, Id.Name, context);
+                Response result = Pipeline.ProcessMessage(message, context);
+                Response<SelfHelpDiagnosticData> response = Response.FromValue(SelfHelpDiagnosticData.FromResponse(result), result);
                 if (response.Value == null)
+                {
                     throw new RequestFailedException(response.GetRawResponse());
+                }
                 return Response.FromValue(new SelfHelpDiagnosticResource(Client, response.Value), response.GetRawResponse());
             }
             catch (Exception e)
@@ -170,39 +189,49 @@ public virtual Response<SelfHelpDiagnosticResource> Get(CancellationToken cancel
         /// Creates a diagnostic for the specific resource using solutionId from discovery solutions. &lt;br/&gt;Diagnostics are powerful solutions that access product resources or other relevant data and provide the root cause of the issue and the steps to address the issue.&lt;br/&gt;&lt;br/&gt;
         /// <list type="bullet">
         /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/diagnostics/{diagnosticsResourceName}</description>
+        /// <term> Request Path. </term>
+        /// <description> /{scope}/providers/Microsoft.Help/diagnostics/{diagnosticsResourceName}. </description>
         /// </item>
         /// <item>
-        /// <term>Operation Id</term>
-        /// <description>DiagnosticResource_Create</description>
+        /// <term> Operation Id. </term>
+        /// <description> DiagnosticResources_Create. </description>
         /// </item>
         /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
         /// </item>
         /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpDiagnosticResource"/></description>
+        /// <term> Resource. </term>
+        /// <description> <see cref="SelfHelpDiagnosticResource"/>. </description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="waitUntil"> <see cref="WaitUntil.Completed"/> if the method should wait to return until the long-running operation has completed on the service; <see cref="WaitUntil.Started"/> if it should return after starting the operation. For more information on long-running operations, please see <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/LongRunningOperations.md"> Azure.Core Long-Running Operation samples</see>. </param>
         /// <param name="data"> The required request body for this insightResource invocation. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="data"/> is null. </exception>
-        public virtual async Task<ArmOperation<SelfHelpDiagnosticResource>> UpdateAsync(WaitUntil waitUntil, SelfHelpDiagnosticData data, CancellationToken cancellationToken = default)
+        public virtual async Task<ArmOperation<SelfHelpDiagnosticResource>> UpdateAsync(WaitUntil waitUntil, SelfHelpDiagnosticData data = default, CancellationToken cancellationToken = default)
         {
-            Argument.AssertNotNull(data, nameof(data));
-
-            using var scope = _selfHelpDiagnosticDiagnosticResourcesClientDiagnostics.CreateScope("SelfHelpDiagnosticResource.Update");
+            using DiagnosticScope scope = _diagnosticResourcesClientDiagnostics.CreateScope("SelfHelpDiagnosticResource.Update");
             scope.Start();
             try
             {
-                var response = await _selfHelpDiagnosticDiagnosticResourcesRestClient.CreateAsync(Id.Parent, Id.Name, data, cancellationToken).ConfigureAwait(false);
-                var operation = new SelfHelpArmOperation<SelfHelpDiagnosticResource>(new SelfHelpDiagnosticOperationSource(Client), _selfHelpDiagnosticDiagnosticResourcesClientDiagnostics, Pipeline, _selfHelpDiagnosticDiagnosticResourcesRestClient.CreateCreateRequest(Id.Parent, Id.Name, data).Request, response, OperationFinalStateVia.AzureAsyncOperation);
+                RequestContext context = new RequestContext
+                {
+                    CancellationToken = cancellationToken
+                };
+                HttpMessage message = _diagnosticResourcesRestClient.CreateCreateRequest(Id.Parent, Id.Name, SelfHelpDiagnosticData.ToRequestContent(data), context);
+                Response response = await Pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
+                SelfHelpArmOperation<SelfHelpDiagnosticResource> operation = new SelfHelpArmOperation<SelfHelpDiagnosticResource>(
+                    new SelfHelpDiagnosticOperationSource(Client),
+                    _diagnosticResourcesClientDiagnostics,
+                    Pipeline,
+                    message.Request,
+                    response,
+                    OperationFinalStateVia.AzureAsyncOperation);
                 if (waitUntil == WaitUntil.Completed)
+                {
                     await operation.WaitForCompletionAsync(cancellationToken).ConfigureAwait(false);
+                }
                 return operation;
             }
             catch (Exception e)
@@ -216,39 +245,49 @@ public virtual async Task<ArmOperation<SelfHelpDiagnosticResource>> UpdateAsync(
         /// Creates a diagnostic for the specific resource using solutionId from discovery solutions. &lt;br/&gt;Diagnostics are powerful solutions that access product resources or other relevant data and provide the root cause of the issue and the steps to address the issue.&lt;br/&gt;&lt;br/&gt;
         /// <list type="bullet">
         /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/diagnostics/{diagnosticsResourceName}</description>
+        /// <term> Request Path. </term>
+        /// <description> /{scope}/providers/Microsoft.Help/diagnostics/{diagnosticsResourceName}. </description>
         /// </item>
         /// <item>
-        /// <term>Operation Id</term>
-        /// <description>DiagnosticResource_Create</description>
+        /// <term> Operation Id. </term>
+        /// <description> DiagnosticResources_Create. </description>
         /// </item>
         /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
         /// </item>
         /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpDiagnosticResource"/></description>
+        /// <term> Resource. </term>
+        /// <description> <see cref="SelfHelpDiagnosticResource"/>. </description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="waitUntil"> <see cref="WaitUntil.Completed"/> if the method should wait to return until the long-running operation has completed on the service; <see cref="WaitUntil.Started"/> if it should return after starting the operation. For more information on long-running operations, please see <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/LongRunningOperations.md"> Azure.Core Long-Running Operation samples</see>. </param>
         /// <param name="data"> The required request body for this insightResource invocation. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="data"/> is null. </exception>
-        public virtual ArmOperation<SelfHelpDiagnosticResource> Update(WaitUntil waitUntil, SelfHelpDiagnosticData data, CancellationToken cancellationToken = default)
+        public virtual ArmOperation<SelfHelpDiagnosticResource> Update(WaitUntil waitUntil, SelfHelpDiagnosticData data = default, CancellationToken cancellationToken = default)
         {
-            Argument.AssertNotNull(data, nameof(data));
-
-            using var scope = _selfHelpDiagnosticDiagnosticResourcesClientDiagnostics.CreateScope("SelfHelpDiagnosticResource.Update");
+            using DiagnosticScope scope = _diagnosticResourcesClientDiagnostics.CreateScope("SelfHelpDiagnosticResource.Update");
             scope.Start();
             try
             {
-                var response = _selfHelpDiagnosticDiagnosticResourcesRestClient.Create(Id.Parent, Id.Name, data, cancellationToken);
-                var operation = new SelfHelpArmOperation<SelfHelpDiagnosticResource>(new SelfHelpDiagnosticOperationSource(Client), _selfHelpDiagnosticDiagnosticResourcesClientDiagnostics, Pipeline, _selfHelpDiagnosticDiagnosticResourcesRestClient.CreateCreateRequest(Id.Parent, Id.Name, data).Request, response, OperationFinalStateVia.AzureAsyncOperation);
+                RequestContext context = new RequestContext
+                {
+                    CancellationToken = cancellationToken
+                };
+                HttpMessage message = _diagnosticResourcesRestClient.CreateCreateRequest(Id.Parent, Id.Name, SelfHelpDiagnosticData.ToRequestContent(data), context);
+                Response response = Pipeline.ProcessMessage(message, context);
+                SelfHelpArmOperation<SelfHelpDiagnosticResource> operation = new SelfHelpArmOperation<SelfHelpDiagnosticResource>(
+                    new SelfHelpDiagnosticOperationSource(Client),
+                    _diagnosticResourcesClientDiagnostics,
+                    Pipeline,
+                    message.Request,
+                    response,
+                    OperationFinalStateVia.AzureAsyncOperation);
                 if (waitUntil == WaitUntil.Completed)
+                {
                     operation.WaitForCompletion(cancellationToken);
+                }
                 return operation;
             }
             catch (Exception e)
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpSimplifiedSolutionCollection.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpSimplifiedSolutionCollection.cs
deleted file mode 100644
index 52c9c51e3762..000000000000
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpSimplifiedSolutionCollection.cs
+++ /dev/null
@@ -1,405 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using Azure.Core;
-using Azure.Core.Pipeline;
-
-namespace Azure.ResourceManager.SelfHelp
-{
-    /// <summary>
-    /// A class representing a collection of <see cref="SelfHelpSimplifiedSolutionResource"/> and their operations.
-    /// Each <see cref="SelfHelpSimplifiedSolutionResource"/> in the collection will belong to the same instance of <see cref="ArmResource"/>.
-    /// To get a <see cref="SelfHelpSimplifiedSolutionCollection"/> instance call the GetSelfHelpSimplifiedSolutions method from an instance of <see cref="ArmResource"/>.
-    /// </summary>
-    public partial class SelfHelpSimplifiedSolutionCollection : ArmCollection
-    {
-        private readonly ClientDiagnostics _selfHelpSimplifiedSolutionSimplifiedSolutionsResourcesClientDiagnostics;
-        private readonly SimplifiedSolutionsResourcesRestOperations _selfHelpSimplifiedSolutionSimplifiedSolutionsResourcesRestClient;
-
-        /// <summary> Initializes a new instance of the <see cref="SelfHelpSimplifiedSolutionCollection"/> class for mocking. </summary>
-        protected SelfHelpSimplifiedSolutionCollection()
-        {
-        }
-
-        /// <summary> Initializes a new instance of the <see cref="SelfHelpSimplifiedSolutionCollection"/> class. </summary>
-        /// <param name="client"> The client parameters to use in these operations. </param>
-        /// <param name="id"> The identifier of the parent resource that is the target of operations. </param>
-        internal SelfHelpSimplifiedSolutionCollection(ArmClient client, ResourceIdentifier id) : base(client, id)
-        {
-            _selfHelpSimplifiedSolutionSimplifiedSolutionsResourcesClientDiagnostics = new ClientDiagnostics("Azure.ResourceManager.SelfHelp", SelfHelpSimplifiedSolutionResource.ResourceType.Namespace, Diagnostics);
-            TryGetApiVersion(SelfHelpSimplifiedSolutionResource.ResourceType, out string selfHelpSimplifiedSolutionSimplifiedSolutionsResourcesApiVersion);
-            _selfHelpSimplifiedSolutionSimplifiedSolutionsResourcesRestClient = new SimplifiedSolutionsResourcesRestOperations(Pipeline, Diagnostics.ApplicationId, Endpoint, selfHelpSimplifiedSolutionSimplifiedSolutionsResourcesApiVersion);
-        }
-
-        /// <summary>
-        /// Creates Simplified Solutions for an Azure subscription using 'solutionId' from Discovery Solutions as the input. &lt;br/&gt;&lt;br/&gt; Simplified Solutions API makes the consumption of solutions APIs easier while still providing access to the same powerful solutions rendered in Solutions API. With Simplified Solutions, users don't have to worry about stitching together the article using replacement maps and can use the content in the API response to directly render as HTML content.&lt;br/&gt;
-        /// <list type="bullet">
-        /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/simplifiedSolutions/{simplifiedSolutionsResourceName}</description>
-        /// </item>
-        /// <item>
-        /// <term>Operation Id</term>
-        /// <description>SimplifiedSolutionsResource_Create</description>
-        /// </item>
-        /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
-        /// </item>
-        /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpSimplifiedSolutionResource"/></description>
-        /// </item>
-        /// </list>
-        /// </summary>
-        /// <param name="waitUntil"> <see cref="WaitUntil.Completed"/> if the method should wait to return until the long-running operation has completed on the service; <see cref="WaitUntil.Started"/> if it should return after starting the operation. For more information on long-running operations, please see <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/LongRunningOperations.md"> Azure.Core Long-Running Operation samples</see>. </param>
-        /// <param name="simplifiedSolutionsResourceName"> Simplified Solutions Resource Name. </param>
-        /// <param name="data"> The required request body for simplified Solutions resource creation. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentException"> <paramref name="simplifiedSolutionsResourceName"/> is an empty string, and was expected to be non-empty. </exception>
-        /// <exception cref="ArgumentNullException"> <paramref name="simplifiedSolutionsResourceName"/> or <paramref name="data"/> is null. </exception>
-        public virtual async Task<ArmOperation<SelfHelpSimplifiedSolutionResource>> CreateOrUpdateAsync(WaitUntil waitUntil, string simplifiedSolutionsResourceName, SelfHelpSimplifiedSolutionData data, CancellationToken cancellationToken = default)
-        {
-            Argument.AssertNotNullOrEmpty(simplifiedSolutionsResourceName, nameof(simplifiedSolutionsResourceName));
-            Argument.AssertNotNull(data, nameof(data));
-
-            using var scope = _selfHelpSimplifiedSolutionSimplifiedSolutionsResourcesClientDiagnostics.CreateScope("SelfHelpSimplifiedSolutionCollection.CreateOrUpdate");
-            scope.Start();
-            try
-            {
-                var response = await _selfHelpSimplifiedSolutionSimplifiedSolutionsResourcesRestClient.CreateAsync(Id, simplifiedSolutionsResourceName, data, cancellationToken).ConfigureAwait(false);
-                var operation = new SelfHelpArmOperation<SelfHelpSimplifiedSolutionResource>(new SelfHelpSimplifiedSolutionOperationSource(Client), _selfHelpSimplifiedSolutionSimplifiedSolutionsResourcesClientDiagnostics, Pipeline, _selfHelpSimplifiedSolutionSimplifiedSolutionsResourcesRestClient.CreateCreateRequest(Id, simplifiedSolutionsResourceName, data).Request, response, OperationFinalStateVia.AzureAsyncOperation);
-                if (waitUntil == WaitUntil.Completed)
-                    await operation.WaitForCompletionAsync(cancellationToken).ConfigureAwait(false);
-                return operation;
-            }
-            catch (Exception e)
-            {
-                scope.Failed(e);
-                throw;
-            }
-        }
-
-        /// <summary>
-        /// Creates Simplified Solutions for an Azure subscription using 'solutionId' from Discovery Solutions as the input. &lt;br/&gt;&lt;br/&gt; Simplified Solutions API makes the consumption of solutions APIs easier while still providing access to the same powerful solutions rendered in Solutions API. With Simplified Solutions, users don't have to worry about stitching together the article using replacement maps and can use the content in the API response to directly render as HTML content.&lt;br/&gt;
-        /// <list type="bullet">
-        /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/simplifiedSolutions/{simplifiedSolutionsResourceName}</description>
-        /// </item>
-        /// <item>
-        /// <term>Operation Id</term>
-        /// <description>SimplifiedSolutionsResource_Create</description>
-        /// </item>
-        /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
-        /// </item>
-        /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpSimplifiedSolutionResource"/></description>
-        /// </item>
-        /// </list>
-        /// </summary>
-        /// <param name="waitUntil"> <see cref="WaitUntil.Completed"/> if the method should wait to return until the long-running operation has completed on the service; <see cref="WaitUntil.Started"/> if it should return after starting the operation. For more information on long-running operations, please see <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/LongRunningOperations.md"> Azure.Core Long-Running Operation samples</see>. </param>
-        /// <param name="simplifiedSolutionsResourceName"> Simplified Solutions Resource Name. </param>
-        /// <param name="data"> The required request body for simplified Solutions resource creation. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentException"> <paramref name="simplifiedSolutionsResourceName"/> is an empty string, and was expected to be non-empty. </exception>
-        /// <exception cref="ArgumentNullException"> <paramref name="simplifiedSolutionsResourceName"/> or <paramref name="data"/> is null. </exception>
-        public virtual ArmOperation<SelfHelpSimplifiedSolutionResource> CreateOrUpdate(WaitUntil waitUntil, string simplifiedSolutionsResourceName, SelfHelpSimplifiedSolutionData data, CancellationToken cancellationToken = default)
-        {
-            Argument.AssertNotNullOrEmpty(simplifiedSolutionsResourceName, nameof(simplifiedSolutionsResourceName));
-            Argument.AssertNotNull(data, nameof(data));
-
-            using var scope = _selfHelpSimplifiedSolutionSimplifiedSolutionsResourcesClientDiagnostics.CreateScope("SelfHelpSimplifiedSolutionCollection.CreateOrUpdate");
-            scope.Start();
-            try
-            {
-                var response = _selfHelpSimplifiedSolutionSimplifiedSolutionsResourcesRestClient.Create(Id, simplifiedSolutionsResourceName, data, cancellationToken);
-                var operation = new SelfHelpArmOperation<SelfHelpSimplifiedSolutionResource>(new SelfHelpSimplifiedSolutionOperationSource(Client), _selfHelpSimplifiedSolutionSimplifiedSolutionsResourcesClientDiagnostics, Pipeline, _selfHelpSimplifiedSolutionSimplifiedSolutionsResourcesRestClient.CreateCreateRequest(Id, simplifiedSolutionsResourceName, data).Request, response, OperationFinalStateVia.AzureAsyncOperation);
-                if (waitUntil == WaitUntil.Completed)
-                    operation.WaitForCompletion(cancellationToken);
-                return operation;
-            }
-            catch (Exception e)
-            {
-                scope.Failed(e);
-                throw;
-            }
-        }
-
-        /// <summary>
-        /// Get the simplified Solutions using the applicable solutionResourceName while creating the simplified Solutions.
-        /// <list type="bullet">
-        /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/simplifiedSolutions/{simplifiedSolutionsResourceName}</description>
-        /// </item>
-        /// <item>
-        /// <term>Operation Id</term>
-        /// <description>SimplifiedSolutionsResource_Get</description>
-        /// </item>
-        /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
-        /// </item>
-        /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpSimplifiedSolutionResource"/></description>
-        /// </item>
-        /// </list>
-        /// </summary>
-        /// <param name="simplifiedSolutionsResourceName"> Simplified Solutions Resource Name. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentException"> <paramref name="simplifiedSolutionsResourceName"/> is an empty string, and was expected to be non-empty. </exception>
-        /// <exception cref="ArgumentNullException"> <paramref name="simplifiedSolutionsResourceName"/> is null. </exception>
-        public virtual async Task<Response<SelfHelpSimplifiedSolutionResource>> GetAsync(string simplifiedSolutionsResourceName, CancellationToken cancellationToken = default)
-        {
-            Argument.AssertNotNullOrEmpty(simplifiedSolutionsResourceName, nameof(simplifiedSolutionsResourceName));
-
-            using var scope = _selfHelpSimplifiedSolutionSimplifiedSolutionsResourcesClientDiagnostics.CreateScope("SelfHelpSimplifiedSolutionCollection.Get");
-            scope.Start();
-            try
-            {
-                var response = await _selfHelpSimplifiedSolutionSimplifiedSolutionsResourcesRestClient.GetAsync(Id, simplifiedSolutionsResourceName, cancellationToken).ConfigureAwait(false);
-                if (response.Value == null)
-                    throw new RequestFailedException(response.GetRawResponse());
-                return Response.FromValue(new SelfHelpSimplifiedSolutionResource(Client, response.Value), response.GetRawResponse());
-            }
-            catch (Exception e)
-            {
-                scope.Failed(e);
-                throw;
-            }
-        }
-
-        /// <summary>
-        /// Get the simplified Solutions using the applicable solutionResourceName while creating the simplified Solutions.
-        /// <list type="bullet">
-        /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/simplifiedSolutions/{simplifiedSolutionsResourceName}</description>
-        /// </item>
-        /// <item>
-        /// <term>Operation Id</term>
-        /// <description>SimplifiedSolutionsResource_Get</description>
-        /// </item>
-        /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
-        /// </item>
-        /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpSimplifiedSolutionResource"/></description>
-        /// </item>
-        /// </list>
-        /// </summary>
-        /// <param name="simplifiedSolutionsResourceName"> Simplified Solutions Resource Name. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentException"> <paramref name="simplifiedSolutionsResourceName"/> is an empty string, and was expected to be non-empty. </exception>
-        /// <exception cref="ArgumentNullException"> <paramref name="simplifiedSolutionsResourceName"/> is null. </exception>
-        public virtual Response<SelfHelpSimplifiedSolutionResource> Get(string simplifiedSolutionsResourceName, CancellationToken cancellationToken = default)
-        {
-            Argument.AssertNotNullOrEmpty(simplifiedSolutionsResourceName, nameof(simplifiedSolutionsResourceName));
-
-            using var scope = _selfHelpSimplifiedSolutionSimplifiedSolutionsResourcesClientDiagnostics.CreateScope("SelfHelpSimplifiedSolutionCollection.Get");
-            scope.Start();
-            try
-            {
-                var response = _selfHelpSimplifiedSolutionSimplifiedSolutionsResourcesRestClient.Get(Id, simplifiedSolutionsResourceName, cancellationToken);
-                if (response.Value == null)
-                    throw new RequestFailedException(response.GetRawResponse());
-                return Response.FromValue(new SelfHelpSimplifiedSolutionResource(Client, response.Value), response.GetRawResponse());
-            }
-            catch (Exception e)
-            {
-                scope.Failed(e);
-                throw;
-            }
-        }
-
-        /// <summary>
-        /// Checks to see if the resource exists in azure.
-        /// <list type="bullet">
-        /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/simplifiedSolutions/{simplifiedSolutionsResourceName}</description>
-        /// </item>
-        /// <item>
-        /// <term>Operation Id</term>
-        /// <description>SimplifiedSolutionsResource_Get</description>
-        /// </item>
-        /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
-        /// </item>
-        /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpSimplifiedSolutionResource"/></description>
-        /// </item>
-        /// </list>
-        /// </summary>
-        /// <param name="simplifiedSolutionsResourceName"> Simplified Solutions Resource Name. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentException"> <paramref name="simplifiedSolutionsResourceName"/> is an empty string, and was expected to be non-empty. </exception>
-        /// <exception cref="ArgumentNullException"> <paramref name="simplifiedSolutionsResourceName"/> is null. </exception>
-        public virtual async Task<Response<bool>> ExistsAsync(string simplifiedSolutionsResourceName, CancellationToken cancellationToken = default)
-        {
-            Argument.AssertNotNullOrEmpty(simplifiedSolutionsResourceName, nameof(simplifiedSolutionsResourceName));
-
-            using var scope = _selfHelpSimplifiedSolutionSimplifiedSolutionsResourcesClientDiagnostics.CreateScope("SelfHelpSimplifiedSolutionCollection.Exists");
-            scope.Start();
-            try
-            {
-                var response = await _selfHelpSimplifiedSolutionSimplifiedSolutionsResourcesRestClient.GetAsync(Id, simplifiedSolutionsResourceName, cancellationToken: cancellationToken).ConfigureAwait(false);
-                return Response.FromValue(response.Value != null, response.GetRawResponse());
-            }
-            catch (Exception e)
-            {
-                scope.Failed(e);
-                throw;
-            }
-        }
-
-        /// <summary>
-        /// Checks to see if the resource exists in azure.
-        /// <list type="bullet">
-        /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/simplifiedSolutions/{simplifiedSolutionsResourceName}</description>
-        /// </item>
-        /// <item>
-        /// <term>Operation Id</term>
-        /// <description>SimplifiedSolutionsResource_Get</description>
-        /// </item>
-        /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
-        /// </item>
-        /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpSimplifiedSolutionResource"/></description>
-        /// </item>
-        /// </list>
-        /// </summary>
-        /// <param name="simplifiedSolutionsResourceName"> Simplified Solutions Resource Name. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentException"> <paramref name="simplifiedSolutionsResourceName"/> is an empty string, and was expected to be non-empty. </exception>
-        /// <exception cref="ArgumentNullException"> <paramref name="simplifiedSolutionsResourceName"/> is null. </exception>
-        public virtual Response<bool> Exists(string simplifiedSolutionsResourceName, CancellationToken cancellationToken = default)
-        {
-            Argument.AssertNotNullOrEmpty(simplifiedSolutionsResourceName, nameof(simplifiedSolutionsResourceName));
-
-            using var scope = _selfHelpSimplifiedSolutionSimplifiedSolutionsResourcesClientDiagnostics.CreateScope("SelfHelpSimplifiedSolutionCollection.Exists");
-            scope.Start();
-            try
-            {
-                var response = _selfHelpSimplifiedSolutionSimplifiedSolutionsResourcesRestClient.Get(Id, simplifiedSolutionsResourceName, cancellationToken: cancellationToken);
-                return Response.FromValue(response.Value != null, response.GetRawResponse());
-            }
-            catch (Exception e)
-            {
-                scope.Failed(e);
-                throw;
-            }
-        }
-
-        /// <summary>
-        /// Tries to get details for this resource from the service.
-        /// <list type="bullet">
-        /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/simplifiedSolutions/{simplifiedSolutionsResourceName}</description>
-        /// </item>
-        /// <item>
-        /// <term>Operation Id</term>
-        /// <description>SimplifiedSolutionsResource_Get</description>
-        /// </item>
-        /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
-        /// </item>
-        /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpSimplifiedSolutionResource"/></description>
-        /// </item>
-        /// </list>
-        /// </summary>
-        /// <param name="simplifiedSolutionsResourceName"> Simplified Solutions Resource Name. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentException"> <paramref name="simplifiedSolutionsResourceName"/> is an empty string, and was expected to be non-empty. </exception>
-        /// <exception cref="ArgumentNullException"> <paramref name="simplifiedSolutionsResourceName"/> is null. </exception>
-        public virtual async Task<NullableResponse<SelfHelpSimplifiedSolutionResource>> GetIfExistsAsync(string simplifiedSolutionsResourceName, CancellationToken cancellationToken = default)
-        {
-            Argument.AssertNotNullOrEmpty(simplifiedSolutionsResourceName, nameof(simplifiedSolutionsResourceName));
-
-            using var scope = _selfHelpSimplifiedSolutionSimplifiedSolutionsResourcesClientDiagnostics.CreateScope("SelfHelpSimplifiedSolutionCollection.GetIfExists");
-            scope.Start();
-            try
-            {
-                var response = await _selfHelpSimplifiedSolutionSimplifiedSolutionsResourcesRestClient.GetAsync(Id, simplifiedSolutionsResourceName, cancellationToken: cancellationToken).ConfigureAwait(false);
-                if (response.Value == null)
-                    return new NoValueResponse<SelfHelpSimplifiedSolutionResource>(response.GetRawResponse());
-                return Response.FromValue(new SelfHelpSimplifiedSolutionResource(Client, response.Value), response.GetRawResponse());
-            }
-            catch (Exception e)
-            {
-                scope.Failed(e);
-                throw;
-            }
-        }
-
-        /// <summary>
-        /// Tries to get details for this resource from the service.
-        /// <list type="bullet">
-        /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/simplifiedSolutions/{simplifiedSolutionsResourceName}</description>
-        /// </item>
-        /// <item>
-        /// <term>Operation Id</term>
-        /// <description>SimplifiedSolutionsResource_Get</description>
-        /// </item>
-        /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
-        /// </item>
-        /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpSimplifiedSolutionResource"/></description>
-        /// </item>
-        /// </list>
-        /// </summary>
-        /// <param name="simplifiedSolutionsResourceName"> Simplified Solutions Resource Name. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentException"> <paramref name="simplifiedSolutionsResourceName"/> is an empty string, and was expected to be non-empty. </exception>
-        /// <exception cref="ArgumentNullException"> <paramref name="simplifiedSolutionsResourceName"/> is null. </exception>
-        public virtual NullableResponse<SelfHelpSimplifiedSolutionResource> GetIfExists(string simplifiedSolutionsResourceName, CancellationToken cancellationToken = default)
-        {
-            Argument.AssertNotNullOrEmpty(simplifiedSolutionsResourceName, nameof(simplifiedSolutionsResourceName));
-
-            using var scope = _selfHelpSimplifiedSolutionSimplifiedSolutionsResourcesClientDiagnostics.CreateScope("SelfHelpSimplifiedSolutionCollection.GetIfExists");
-            scope.Start();
-            try
-            {
-                var response = _selfHelpSimplifiedSolutionSimplifiedSolutionsResourcesRestClient.Get(Id, simplifiedSolutionsResourceName, cancellationToken: cancellationToken);
-                if (response.Value == null)
-                    return new NoValueResponse<SelfHelpSimplifiedSolutionResource>(response.GetRawResponse());
-                return Response.FromValue(new SelfHelpSimplifiedSolutionResource(Client, response.Value), response.GetRawResponse());
-            }
-            catch (Exception e)
-            {
-                scope.Failed(e);
-                throw;
-            }
-        }
-    }
-}
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpSimplifiedSolutionData.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpSimplifiedSolutionData.Serialization.cs
deleted file mode 100644
index 46b80555ada7..000000000000
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpSimplifiedSolutionData.Serialization.cs
+++ /dev/null
@@ -1,261 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text;
-using System.Text.Json;
-using Azure.Core;
-using Azure.ResourceManager.Models;
-using Azure.ResourceManager.SelfHelp.Models;
-
-namespace Azure.ResourceManager.SelfHelp
-{
-    public partial class SelfHelpSimplifiedSolutionData : IUtf8JsonSerializable, IJsonModel<SelfHelpSimplifiedSolutionData>
-    {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<SelfHelpSimplifiedSolutionData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
-        void IJsonModel<SelfHelpSimplifiedSolutionData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpSimplifiedSolutionData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(SelfHelpSimplifiedSolutionData)} does not support writing '{format}' format.");
-            }
-
-            base.JsonModelWriteCore(writer, options);
-            writer.WritePropertyName("properties"u8);
-            writer.WriteStartObject();
-            if (Optional.IsDefined(SolutionId))
-            {
-                writer.WritePropertyName("solutionId"u8);
-                writer.WriteStringValue(SolutionId);
-            }
-            if (Optional.IsCollectionDefined(Parameters))
-            {
-                writer.WritePropertyName("parameters"u8);
-                writer.WriteStartObject();
-                foreach (var item in Parameters)
-                {
-                    writer.WritePropertyName(item.Key);
-                    writer.WriteStringValue(item.Value);
-                }
-                writer.WriteEndObject();
-            }
-            if (options.Format != "W" && Optional.IsDefined(Title))
-            {
-                writer.WritePropertyName("title"u8);
-                writer.WriteStringValue(Title);
-            }
-            if (options.Format != "W" && Optional.IsCollectionDefined(Appendix))
-            {
-                writer.WritePropertyName("appendix"u8);
-                writer.WriteStartObject();
-                foreach (var item in Appendix)
-                {
-                    writer.WritePropertyName(item.Key);
-                    writer.WriteStringValue(item.Value);
-                }
-                writer.WriteEndObject();
-            }
-            if (options.Format != "W" && Optional.IsDefined(Content))
-            {
-                writer.WritePropertyName("content"u8);
-                writer.WriteStringValue(Content);
-            }
-            if (options.Format != "W" && Optional.IsDefined(ProvisioningState))
-            {
-                writer.WritePropertyName("provisioningState"u8);
-                writer.WriteStringValue(ProvisioningState.Value.ToString());
-            }
-            writer.WriteEndObject();
-        }
-
-        SelfHelpSimplifiedSolutionData IJsonModel<SelfHelpSimplifiedSolutionData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpSimplifiedSolutionData>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(SelfHelpSimplifiedSolutionData)} does not support reading '{format}' format.");
-            }
-
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeSelfHelpSimplifiedSolutionData(document.RootElement, options);
-        }
-
-        internal static SelfHelpSimplifiedSolutionData DeserializeSelfHelpSimplifiedSolutionData(JsonElement element, ModelReaderWriterOptions options = null)
-        {
-            options ??= ModelSerializationExtensions.WireOptions;
-
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            ResourceIdentifier id = default;
-            string name = default;
-            ResourceType type = default;
-            SystemData systemData = default;
-            string solutionId = default;
-            IDictionary<string, string> parameters = default;
-            string title = default;
-            IReadOnlyDictionary<string, string> appendix = default;
-            string content = default;
-            SolutionProvisioningState? provisioningState = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
-            {
-                if (property.NameEquals("id"u8))
-                {
-                    id = new ResourceIdentifier(property.Value.GetString());
-                    continue;
-                }
-                if (property.NameEquals("name"u8))
-                {
-                    name = property.Value.GetString();
-                    continue;
-                }
-                if (property.NameEquals("type"u8))
-                {
-                    type = new ResourceType(property.Value.GetString());
-                    continue;
-                }
-                if (property.NameEquals("systemData"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    systemData = ModelReaderWriter.Read<SystemData>(new BinaryData(Encoding.UTF8.GetBytes(property.Value.GetRawText())), ModelSerializationExtensions.WireOptions, AzureResourceManagerSelfHelpContext.Default);
-                    continue;
-                }
-                if (property.NameEquals("properties"u8))
-                {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        property.ThrowNonNullablePropertyIsNull();
-                        continue;
-                    }
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        if (property0.NameEquals("solutionId"u8))
-                        {
-                            solutionId = property0.Value.GetString();
-                            continue;
-                        }
-                        if (property0.NameEquals("parameters"u8))
-                        {
-                            if (property0.Value.ValueKind == JsonValueKind.Null)
-                            {
-                                continue;
-                            }
-                            Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                            foreach (var property1 in property0.Value.EnumerateObject())
-                            {
-                                dictionary.Add(property1.Name, property1.Value.GetString());
-                            }
-                            parameters = dictionary;
-                            continue;
-                        }
-                        if (property0.NameEquals("title"u8))
-                        {
-                            title = property0.Value.GetString();
-                            continue;
-                        }
-                        if (property0.NameEquals("appendix"u8))
-                        {
-                            if (property0.Value.ValueKind == JsonValueKind.Null)
-                            {
-                                continue;
-                            }
-                            Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                            foreach (var property1 in property0.Value.EnumerateObject())
-                            {
-                                dictionary.Add(property1.Name, property1.Value.GetString());
-                            }
-                            appendix = dictionary;
-                            continue;
-                        }
-                        if (property0.NameEquals("content"u8))
-                        {
-                            content = property0.Value.GetString();
-                            continue;
-                        }
-                        if (property0.NameEquals("provisioningState"u8))
-                        {
-                            if (property0.Value.ValueKind == JsonValueKind.Null)
-                            {
-                                continue;
-                            }
-                            provisioningState = new SolutionProvisioningState(property0.Value.GetString());
-                            continue;
-                        }
-                    }
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
-                }
-            }
-            serializedAdditionalRawData = rawDataDictionary;
-            return new SelfHelpSimplifiedSolutionData(
-                id,
-                name,
-                type,
-                systemData,
-                solutionId,
-                parameters ?? new ChangeTrackingDictionary<string, string>(),
-                title,
-                appendix ?? new ChangeTrackingDictionary<string, string>(),
-                content,
-                provisioningState,
-                serializedAdditionalRawData);
-        }
-
-        BinaryData IPersistableModel<SelfHelpSimplifiedSolutionData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpSimplifiedSolutionData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options, AzureResourceManagerSelfHelpContext.Default);
-                default:
-                    throw new FormatException($"The model {nameof(SelfHelpSimplifiedSolutionData)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        SelfHelpSimplifiedSolutionData IPersistableModel<SelfHelpSimplifiedSolutionData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpSimplifiedSolutionData>)this).GetFormatFromOptions(options) : options.Format;
-
-            switch (format)
-            {
-                case "J":
-                    {
-                        using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
-                        return DeserializeSelfHelpSimplifiedSolutionData(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(SelfHelpSimplifiedSolutionData)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<SelfHelpSimplifiedSolutionData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-    }
-}
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpSimplifiedSolutionData.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpSimplifiedSolutionData.cs
deleted file mode 100644
index f44e3a11b1c4..000000000000
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpSimplifiedSolutionData.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-using Azure.Core;
-using Azure.ResourceManager.Models;
-using Azure.ResourceManager.SelfHelp.Models;
-
-namespace Azure.ResourceManager.SelfHelp
-{
-    /// <summary>
-    /// A class representing the SelfHelpSimplifiedSolution data model.
-    /// Simplified Solutions response.
-    /// </summary>
-    public partial class SelfHelpSimplifiedSolutionData : ResourceData
-    {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
-
-        /// <summary> Initializes a new instance of <see cref="SelfHelpSimplifiedSolutionData"/>. </summary>
-        public SelfHelpSimplifiedSolutionData()
-        {
-            Parameters = new ChangeTrackingDictionary<string, string>();
-            Appendix = new ChangeTrackingDictionary<string, string>();
-        }
-
-        /// <summary> Initializes a new instance of <see cref="SelfHelpSimplifiedSolutionData"/>. </summary>
-        /// <param name="id"> The id. </param>
-        /// <param name="name"> The name. </param>
-        /// <param name="resourceType"> The resourceType. </param>
-        /// <param name="systemData"> The systemData. </param>
-        /// <param name="solutionId"> Solution Id to identify single Simplified Solution. </param>
-        /// <param name="parameters"> Client input parameters to run Simplified Solutions. </param>
-        /// <param name="title"> The title. </param>
-        /// <param name="appendix"> Additional parameter response for Simplified Solutions. </param>
-        /// <param name="content"> The HTML content that needs to be rendered and shown to customer. </param>
-        /// <param name="provisioningState"> Status of Simplified Solution provisioning. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal SelfHelpSimplifiedSolutionData(ResourceIdentifier id, string name, ResourceType resourceType, SystemData systemData, string solutionId, IDictionary<string, string> parameters, string title, IReadOnlyDictionary<string, string> appendix, string content, SolutionProvisioningState? provisioningState, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(id, name, resourceType, systemData)
-        {
-            SolutionId = solutionId;
-            Parameters = parameters;
-            Title = title;
-            Appendix = appendix;
-            Content = content;
-            ProvisioningState = provisioningState;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
-        }
-
-        /// <summary> Solution Id to identify single Simplified Solution. </summary>
-        public string SolutionId { get; set; }
-        /// <summary> Client input parameters to run Simplified Solutions. </summary>
-        public IDictionary<string, string> Parameters { get; }
-        /// <summary> The title. </summary>
-        public string Title { get; }
-        /// <summary> Additional parameter response for Simplified Solutions. </summary>
-        public IReadOnlyDictionary<string, string> Appendix { get; }
-        /// <summary> The HTML content that needs to be rendered and shown to customer. </summary>
-        public string Content { get; }
-        /// <summary> Status of Simplified Solution provisioning. </summary>
-        public SolutionProvisioningState? ProvisioningState { get; }
-    }
-}
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpSimplifiedSolutionResource.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpSimplifiedSolutionResource.Serialization.cs
deleted file mode 100644
index 4e916436618d..000000000000
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpSimplifiedSolutionResource.Serialization.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel.Primitives;
-using System.Text.Json;
-
-namespace Azure.ResourceManager.SelfHelp
-{
-    public partial class SelfHelpSimplifiedSolutionResource : IJsonModel<SelfHelpSimplifiedSolutionData>
-    {
-        private static SelfHelpSimplifiedSolutionData s_dataDeserializationInstance;
-        private static SelfHelpSimplifiedSolutionData DataDeserializationInstance => s_dataDeserializationInstance ??= new();
-
-        void IJsonModel<SelfHelpSimplifiedSolutionData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => ((IJsonModel<SelfHelpSimplifiedSolutionData>)Data).Write(writer, options);
-
-        SelfHelpSimplifiedSolutionData IJsonModel<SelfHelpSimplifiedSolutionData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => ((IJsonModel<SelfHelpSimplifiedSolutionData>)DataDeserializationInstance).Create(ref reader, options);
-
-        BinaryData IPersistableModel<SelfHelpSimplifiedSolutionData>.Write(ModelReaderWriterOptions options) => ModelReaderWriter.Write<SelfHelpSimplifiedSolutionData>(Data, options, AzureResourceManagerSelfHelpContext.Default);
-
-        SelfHelpSimplifiedSolutionData IPersistableModel<SelfHelpSimplifiedSolutionData>.Create(BinaryData data, ModelReaderWriterOptions options) => ModelReaderWriter.Read<SelfHelpSimplifiedSolutionData>(data, options, AzureResourceManagerSelfHelpContext.Default);
-
-        string IPersistableModel<SelfHelpSimplifiedSolutionData>.GetFormatFromOptions(ModelReaderWriterOptions options) => ((IPersistableModel<SelfHelpSimplifiedSolutionData>)DataDeserializationInstance).GetFormatFromOptions(options);
-    }
-}
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpSimplifiedSolutionResource.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpSimplifiedSolutionResource.cs
deleted file mode 100644
index 415faffc7fd9..000000000000
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpSimplifiedSolutionResource.cs
+++ /dev/null
@@ -1,261 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Globalization;
-using System.Threading;
-using System.Threading.Tasks;
-using Azure.Core;
-using Azure.Core.Pipeline;
-
-namespace Azure.ResourceManager.SelfHelp
-{
-    /// <summary>
-    /// A Class representing a SelfHelpSimplifiedSolution along with the instance operations that can be performed on it.
-    /// If you have a <see cref="ResourceIdentifier"/> you can construct a <see cref="SelfHelpSimplifiedSolutionResource"/>
-    /// from an instance of <see cref="ArmClient"/> using the GetSelfHelpSimplifiedSolutionResource method.
-    /// Otherwise you can get one from its parent resource <see cref="ArmResource"/> using the GetSelfHelpSimplifiedSolution method.
-    /// </summary>
-    public partial class SelfHelpSimplifiedSolutionResource : ArmResource
-    {
-        /// <summary> Generate the resource identifier of a <see cref="SelfHelpSimplifiedSolutionResource"/> instance. </summary>
-        /// <param name="scope"> The scope. </param>
-        /// <param name="simplifiedSolutionsResourceName"> The simplifiedSolutionsResourceName. </param>
-        public static ResourceIdentifier CreateResourceIdentifier(string scope, string simplifiedSolutionsResourceName)
-        {
-            var resourceId = $"{scope}/providers/Microsoft.Help/simplifiedSolutions/{simplifiedSolutionsResourceName}";
-            return new ResourceIdentifier(resourceId);
-        }
-
-        private readonly ClientDiagnostics _selfHelpSimplifiedSolutionSimplifiedSolutionsResourcesClientDiagnostics;
-        private readonly SimplifiedSolutionsResourcesRestOperations _selfHelpSimplifiedSolutionSimplifiedSolutionsResourcesRestClient;
-        private readonly SelfHelpSimplifiedSolutionData _data;
-
-        /// <summary> Gets the resource type for the operations. </summary>
-        public static readonly ResourceType ResourceType = "Microsoft.Help/simplifiedSolutions";
-
-        /// <summary> Initializes a new instance of the <see cref="SelfHelpSimplifiedSolutionResource"/> class for mocking. </summary>
-        protected SelfHelpSimplifiedSolutionResource()
-        {
-        }
-
-        /// <summary> Initializes a new instance of the <see cref="SelfHelpSimplifiedSolutionResource"/> class. </summary>
-        /// <param name="client"> The client parameters to use in these operations. </param>
-        /// <param name="data"> The resource that is the target of operations. </param>
-        internal SelfHelpSimplifiedSolutionResource(ArmClient client, SelfHelpSimplifiedSolutionData data) : this(client, data.Id)
-        {
-            HasData = true;
-            _data = data;
-        }
-
-        /// <summary> Initializes a new instance of the <see cref="SelfHelpSimplifiedSolutionResource"/> class. </summary>
-        /// <param name="client"> The client parameters to use in these operations. </param>
-        /// <param name="id"> The identifier of the resource that is the target of operations. </param>
-        internal SelfHelpSimplifiedSolutionResource(ArmClient client, ResourceIdentifier id) : base(client, id)
-        {
-            _selfHelpSimplifiedSolutionSimplifiedSolutionsResourcesClientDiagnostics = new ClientDiagnostics("Azure.ResourceManager.SelfHelp", ResourceType.Namespace, Diagnostics);
-            TryGetApiVersion(ResourceType, out string selfHelpSimplifiedSolutionSimplifiedSolutionsResourcesApiVersion);
-            _selfHelpSimplifiedSolutionSimplifiedSolutionsResourcesRestClient = new SimplifiedSolutionsResourcesRestOperations(Pipeline, Diagnostics.ApplicationId, Endpoint, selfHelpSimplifiedSolutionSimplifiedSolutionsResourcesApiVersion);
-#if DEBUG
-			ValidateResourceId(Id);
-#endif
-        }
-
-        /// <summary> Gets whether or not the current instance has data. </summary>
-        public virtual bool HasData { get; }
-
-        /// <summary> Gets the data representing this Feature. </summary>
-        /// <exception cref="InvalidOperationException"> Throws if there is no data loaded in the current instance. </exception>
-        public virtual SelfHelpSimplifiedSolutionData Data
-        {
-            get
-            {
-                if (!HasData)
-                    throw new InvalidOperationException("The current instance does not have data, you must call Get first.");
-                return _data;
-            }
-        }
-
-        internal static void ValidateResourceId(ResourceIdentifier id)
-        {
-            if (id.ResourceType != ResourceType)
-                throw new ArgumentException(string.Format(CultureInfo.CurrentCulture, "Invalid resource type {0} expected {1}", id.ResourceType, ResourceType), nameof(id));
-        }
-
-        /// <summary>
-        /// Get the simplified Solutions using the applicable solutionResourceName while creating the simplified Solutions.
-        /// <list type="bullet">
-        /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/simplifiedSolutions/{simplifiedSolutionsResourceName}</description>
-        /// </item>
-        /// <item>
-        /// <term>Operation Id</term>
-        /// <description>SimplifiedSolutionsResource_Get</description>
-        /// </item>
-        /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
-        /// </item>
-        /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpSimplifiedSolutionResource"/></description>
-        /// </item>
-        /// </list>
-        /// </summary>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        public virtual async Task<Response<SelfHelpSimplifiedSolutionResource>> GetAsync(CancellationToken cancellationToken = default)
-        {
-            using var scope = _selfHelpSimplifiedSolutionSimplifiedSolutionsResourcesClientDiagnostics.CreateScope("SelfHelpSimplifiedSolutionResource.Get");
-            scope.Start();
-            try
-            {
-                var response = await _selfHelpSimplifiedSolutionSimplifiedSolutionsResourcesRestClient.GetAsync(Id.Parent, Id.Name, cancellationToken).ConfigureAwait(false);
-                if (response.Value == null)
-                    throw new RequestFailedException(response.GetRawResponse());
-                return Response.FromValue(new SelfHelpSimplifiedSolutionResource(Client, response.Value), response.GetRawResponse());
-            }
-            catch (Exception e)
-            {
-                scope.Failed(e);
-                throw;
-            }
-        }
-
-        /// <summary>
-        /// Get the simplified Solutions using the applicable solutionResourceName while creating the simplified Solutions.
-        /// <list type="bullet">
-        /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/simplifiedSolutions/{simplifiedSolutionsResourceName}</description>
-        /// </item>
-        /// <item>
-        /// <term>Operation Id</term>
-        /// <description>SimplifiedSolutionsResource_Get</description>
-        /// </item>
-        /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
-        /// </item>
-        /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpSimplifiedSolutionResource"/></description>
-        /// </item>
-        /// </list>
-        /// </summary>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        public virtual Response<SelfHelpSimplifiedSolutionResource> Get(CancellationToken cancellationToken = default)
-        {
-            using var scope = _selfHelpSimplifiedSolutionSimplifiedSolutionsResourcesClientDiagnostics.CreateScope("SelfHelpSimplifiedSolutionResource.Get");
-            scope.Start();
-            try
-            {
-                var response = _selfHelpSimplifiedSolutionSimplifiedSolutionsResourcesRestClient.Get(Id.Parent, Id.Name, cancellationToken);
-                if (response.Value == null)
-                    throw new RequestFailedException(response.GetRawResponse());
-                return Response.FromValue(new SelfHelpSimplifiedSolutionResource(Client, response.Value), response.GetRawResponse());
-            }
-            catch (Exception e)
-            {
-                scope.Failed(e);
-                throw;
-            }
-        }
-
-        /// <summary>
-        /// Creates Simplified Solutions for an Azure subscription using 'solutionId' from Discovery Solutions as the input. &lt;br/&gt;&lt;br/&gt; Simplified Solutions API makes the consumption of solutions APIs easier while still providing access to the same powerful solutions rendered in Solutions API. With Simplified Solutions, users don't have to worry about stitching together the article using replacement maps and can use the content in the API response to directly render as HTML content.&lt;br/&gt;
-        /// <list type="bullet">
-        /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/simplifiedSolutions/{simplifiedSolutionsResourceName}</description>
-        /// </item>
-        /// <item>
-        /// <term>Operation Id</term>
-        /// <description>SimplifiedSolutionsResource_Create</description>
-        /// </item>
-        /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
-        /// </item>
-        /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpSimplifiedSolutionResource"/></description>
-        /// </item>
-        /// </list>
-        /// </summary>
-        /// <param name="waitUntil"> <see cref="WaitUntil.Completed"/> if the method should wait to return until the long-running operation has completed on the service; <see cref="WaitUntil.Started"/> if it should return after starting the operation. For more information on long-running operations, please see <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/LongRunningOperations.md"> Azure.Core Long-Running Operation samples</see>. </param>
-        /// <param name="data"> The required request body for simplified Solutions resource creation. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="data"/> is null. </exception>
-        public virtual async Task<ArmOperation<SelfHelpSimplifiedSolutionResource>> UpdateAsync(WaitUntil waitUntil, SelfHelpSimplifiedSolutionData data, CancellationToken cancellationToken = default)
-        {
-            Argument.AssertNotNull(data, nameof(data));
-
-            using var scope = _selfHelpSimplifiedSolutionSimplifiedSolutionsResourcesClientDiagnostics.CreateScope("SelfHelpSimplifiedSolutionResource.Update");
-            scope.Start();
-            try
-            {
-                var response = await _selfHelpSimplifiedSolutionSimplifiedSolutionsResourcesRestClient.CreateAsync(Id.Parent, Id.Name, data, cancellationToken).ConfigureAwait(false);
-                var operation = new SelfHelpArmOperation<SelfHelpSimplifiedSolutionResource>(new SelfHelpSimplifiedSolutionOperationSource(Client), _selfHelpSimplifiedSolutionSimplifiedSolutionsResourcesClientDiagnostics, Pipeline, _selfHelpSimplifiedSolutionSimplifiedSolutionsResourcesRestClient.CreateCreateRequest(Id.Parent, Id.Name, data).Request, response, OperationFinalStateVia.AzureAsyncOperation);
-                if (waitUntil == WaitUntil.Completed)
-                    await operation.WaitForCompletionAsync(cancellationToken).ConfigureAwait(false);
-                return operation;
-            }
-            catch (Exception e)
-            {
-                scope.Failed(e);
-                throw;
-            }
-        }
-
-        /// <summary>
-        /// Creates Simplified Solutions for an Azure subscription using 'solutionId' from Discovery Solutions as the input. &lt;br/&gt;&lt;br/&gt; Simplified Solutions API makes the consumption of solutions APIs easier while still providing access to the same powerful solutions rendered in Solutions API. With Simplified Solutions, users don't have to worry about stitching together the article using replacement maps and can use the content in the API response to directly render as HTML content.&lt;br/&gt;
-        /// <list type="bullet">
-        /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/simplifiedSolutions/{simplifiedSolutionsResourceName}</description>
-        /// </item>
-        /// <item>
-        /// <term>Operation Id</term>
-        /// <description>SimplifiedSolutionsResource_Create</description>
-        /// </item>
-        /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
-        /// </item>
-        /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpSimplifiedSolutionResource"/></description>
-        /// </item>
-        /// </list>
-        /// </summary>
-        /// <param name="waitUntil"> <see cref="WaitUntil.Completed"/> if the method should wait to return until the long-running operation has completed on the service; <see cref="WaitUntil.Started"/> if it should return after starting the operation. For more information on long-running operations, please see <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/LongRunningOperations.md"> Azure.Core Long-Running Operation samples</see>. </param>
-        /// <param name="data"> The required request body for simplified Solutions resource creation. </param>
-        /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="data"/> is null. </exception>
-        public virtual ArmOperation<SelfHelpSimplifiedSolutionResource> Update(WaitUntil waitUntil, SelfHelpSimplifiedSolutionData data, CancellationToken cancellationToken = default)
-        {
-            Argument.AssertNotNull(data, nameof(data));
-
-            using var scope = _selfHelpSimplifiedSolutionSimplifiedSolutionsResourcesClientDiagnostics.CreateScope("SelfHelpSimplifiedSolutionResource.Update");
-            scope.Start();
-            try
-            {
-                var response = _selfHelpSimplifiedSolutionSimplifiedSolutionsResourcesRestClient.Create(Id.Parent, Id.Name, data, cancellationToken);
-                var operation = new SelfHelpArmOperation<SelfHelpSimplifiedSolutionResource>(new SelfHelpSimplifiedSolutionOperationSource(Client), _selfHelpSimplifiedSolutionSimplifiedSolutionsResourcesClientDiagnostics, Pipeline, _selfHelpSimplifiedSolutionSimplifiedSolutionsResourcesRestClient.CreateCreateRequest(Id.Parent, Id.Name, data).Request, response, OperationFinalStateVia.AzureAsyncOperation);
-                if (waitUntil == WaitUntil.Completed)
-                    operation.WaitForCompletion(cancellationToken);
-                return operation;
-            }
-            catch (Exception e)
-            {
-                scope.Failed(e);
-                throw;
-            }
-        }
-    }
-}
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpSimplifiedSolutionsCollection.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpSimplifiedSolutionsCollection.cs
new file mode 100644
index 000000000000..a7f6e8cc50be
--- /dev/null
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpSimplifiedSolutionsCollection.cs
@@ -0,0 +1,491 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Azure;
+using Azure.Core;
+using Azure.Core.Pipeline;
+using Azure.ResourceManager;
+
+namespace Azure.ResourceManager.SelfHelp
+{
+    /// <summary>
+    /// A class representing a collection of <see cref="SelfHelpSimplifiedSolutionsResource"/> and their operations.
+    /// Each <see cref="SelfHelpSimplifiedSolutionsResource"/> in the collection will belong to the same instance of <see cref="ArmResource"/>.
+    /// To get a <see cref="SelfHelpSimplifiedSolutionsCollection"/> instance call the GetSelfHelpSimplifiedSolutions method from an instance of <see cref="ArmResource"/>.
+    /// </summary>
+    public partial class SelfHelpSimplifiedSolutionsCollection : ArmCollection
+    {
+        private readonly ClientDiagnostics _simplifiedSolutionsResourcesClientDiagnostics;
+        private readonly SimplifiedSolutionsResources _simplifiedSolutionsResourcesRestClient;
+
+        /// <summary> Initializes a new instance of SelfHelpSimplifiedSolutionsCollection for mocking. </summary>
+        protected SelfHelpSimplifiedSolutionsCollection()
+        {
+        }
+
+        /// <summary> Initializes a new instance of <see cref="SelfHelpSimplifiedSolutionsCollection"/> class. </summary>
+        /// <param name="client"> The client parameters to use in these operations. </param>
+        /// <param name="id"> The identifier of the resource that is the target of operations. </param>
+        internal SelfHelpSimplifiedSolutionsCollection(ArmClient client, ResourceIdentifier id) : base(client, id)
+        {
+            TryGetApiVersion(SelfHelpSimplifiedSolutionsResource.ResourceType, out string selfHelpSimplifiedSolutionsApiVersion);
+            _simplifiedSolutionsResourcesClientDiagnostics = new ClientDiagnostics("Azure.ResourceManager.SelfHelp", SelfHelpSimplifiedSolutionsResource.ResourceType.Namespace, Diagnostics);
+            _simplifiedSolutionsResourcesRestClient = new SimplifiedSolutionsResources(_simplifiedSolutionsResourcesClientDiagnostics, Pipeline, Endpoint, selfHelpSimplifiedSolutionsApiVersion ?? "2024-03-01-preview");
+        }
+
+        /// <summary>
+        /// Creates Simplified Solutions for an Azure subscription using 'solutionId' from Discovery Solutions as the input. &lt;br/&gt;&lt;br/&gt; Simplified Solutions API makes the consumption of solutions APIs easier while still providing access to the same powerful solutions rendered in Solutions API. With Simplified Solutions, users don't have to worry about stitching together the article using replacement maps and can use the content in the API response to directly render as HTML content.&lt;br/&gt;
+        /// <list type="bullet">
+        /// <item>
+        /// <term> Request Path. </term>
+        /// <description> /{scope}/providers/Microsoft.Help/simplifiedSolutions/{simplifiedSolutionsResourceName}. </description>
+        /// </item>
+        /// <item>
+        /// <term> Operation Id. </term>
+        /// <description> SimplifiedSolutionsResources_Create. </description>
+        /// </item>
+        /// <item>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="waitUntil"> <see cref="WaitUntil.Completed"/> if the method should wait to return until the long-running operation has completed on the service; <see cref="WaitUntil.Started"/> if it should return after starting the operation. For more information on long-running operations, please see <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/LongRunningOperations.md"> Azure.Core Long-Running Operation samples</see>. </param>
+        /// <param name="simplifiedSolutionsResourceName"> Simplified Solutions Resource Name. </param>
+        /// <param name="data"> The required request body for simplified Solutions resource creation. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="simplifiedSolutionsResourceName"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="simplifiedSolutionsResourceName"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual async Task<ArmOperation<SelfHelpSimplifiedSolutionsResource>> CreateOrUpdateAsync(WaitUntil waitUntil, string simplifiedSolutionsResourceName, SelfHelpSimplifiedSolutionsData data = default, CancellationToken cancellationToken = default)
+        {
+            Argument.AssertNotNullOrEmpty(simplifiedSolutionsResourceName, nameof(simplifiedSolutionsResourceName));
+
+            using DiagnosticScope scope = _simplifiedSolutionsResourcesClientDiagnostics.CreateScope("SelfHelpSimplifiedSolutionsCollection.CreateOrUpdate");
+            scope.Start();
+            try
+            {
+                RequestContext context = new RequestContext
+                {
+                    CancellationToken = cancellationToken
+                };
+                HttpMessage message = _simplifiedSolutionsResourcesRestClient.CreateCreateRequest(Id, simplifiedSolutionsResourceName, SelfHelpSimplifiedSolutionsData.ToRequestContent(data), context);
+                Response response = await Pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
+                SelfHelpArmOperation<SelfHelpSimplifiedSolutionsResource> operation = new SelfHelpArmOperation<SelfHelpSimplifiedSolutionsResource>(
+                    new SelfHelpSimplifiedSolutionsOperationSource(Client),
+                    _simplifiedSolutionsResourcesClientDiagnostics,
+                    Pipeline,
+                    message.Request,
+                    response,
+                    OperationFinalStateVia.AzureAsyncOperation);
+                if (waitUntil == WaitUntil.Completed)
+                {
+                    await operation.WaitForCompletionAsync(cancellationToken).ConfigureAwait(false);
+                }
+                return operation;
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// Creates Simplified Solutions for an Azure subscription using 'solutionId' from Discovery Solutions as the input. &lt;br/&gt;&lt;br/&gt; Simplified Solutions API makes the consumption of solutions APIs easier while still providing access to the same powerful solutions rendered in Solutions API. With Simplified Solutions, users don't have to worry about stitching together the article using replacement maps and can use the content in the API response to directly render as HTML content.&lt;br/&gt;
+        /// <list type="bullet">
+        /// <item>
+        /// <term> Request Path. </term>
+        /// <description> /{scope}/providers/Microsoft.Help/simplifiedSolutions/{simplifiedSolutionsResourceName}. </description>
+        /// </item>
+        /// <item>
+        /// <term> Operation Id. </term>
+        /// <description> SimplifiedSolutionsResources_Create. </description>
+        /// </item>
+        /// <item>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="waitUntil"> <see cref="WaitUntil.Completed"/> if the method should wait to return until the long-running operation has completed on the service; <see cref="WaitUntil.Started"/> if it should return after starting the operation. For more information on long-running operations, please see <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/LongRunningOperations.md"> Azure.Core Long-Running Operation samples</see>. </param>
+        /// <param name="simplifiedSolutionsResourceName"> Simplified Solutions Resource Name. </param>
+        /// <param name="data"> The required request body for simplified Solutions resource creation. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="simplifiedSolutionsResourceName"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="simplifiedSolutionsResourceName"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual ArmOperation<SelfHelpSimplifiedSolutionsResource> CreateOrUpdate(WaitUntil waitUntil, string simplifiedSolutionsResourceName, SelfHelpSimplifiedSolutionsData data = default, CancellationToken cancellationToken = default)
+        {
+            Argument.AssertNotNullOrEmpty(simplifiedSolutionsResourceName, nameof(simplifiedSolutionsResourceName));
+
+            using DiagnosticScope scope = _simplifiedSolutionsResourcesClientDiagnostics.CreateScope("SelfHelpSimplifiedSolutionsCollection.CreateOrUpdate");
+            scope.Start();
+            try
+            {
+                RequestContext context = new RequestContext
+                {
+                    CancellationToken = cancellationToken
+                };
+                HttpMessage message = _simplifiedSolutionsResourcesRestClient.CreateCreateRequest(Id, simplifiedSolutionsResourceName, SelfHelpSimplifiedSolutionsData.ToRequestContent(data), context);
+                Response response = Pipeline.ProcessMessage(message, context);
+                SelfHelpArmOperation<SelfHelpSimplifiedSolutionsResource> operation = new SelfHelpArmOperation<SelfHelpSimplifiedSolutionsResource>(
+                    new SelfHelpSimplifiedSolutionsOperationSource(Client),
+                    _simplifiedSolutionsResourcesClientDiagnostics,
+                    Pipeline,
+                    message.Request,
+                    response,
+                    OperationFinalStateVia.AzureAsyncOperation);
+                if (waitUntil == WaitUntil.Completed)
+                {
+                    operation.WaitForCompletion(cancellationToken);
+                }
+                return operation;
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// Get the simplified Solutions using the applicable solutionResourceName while creating the simplified Solutions.
+        /// <list type="bullet">
+        /// <item>
+        /// <term> Request Path. </term>
+        /// <description> /{scope}/providers/Microsoft.Help/simplifiedSolutions/{simplifiedSolutionsResourceName}. </description>
+        /// </item>
+        /// <item>
+        /// <term> Operation Id. </term>
+        /// <description> SimplifiedSolutionsResources_Get. </description>
+        /// </item>
+        /// <item>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="simplifiedSolutionsResourceName"> Simplified Solutions Resource Name. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="simplifiedSolutionsResourceName"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="simplifiedSolutionsResourceName"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual async Task<Response<SelfHelpSimplifiedSolutionsResource>> GetAsync(string simplifiedSolutionsResourceName, CancellationToken cancellationToken = default)
+        {
+            Argument.AssertNotNullOrEmpty(simplifiedSolutionsResourceName, nameof(simplifiedSolutionsResourceName));
+
+            using DiagnosticScope scope = _simplifiedSolutionsResourcesClientDiagnostics.CreateScope("SelfHelpSimplifiedSolutionsCollection.Get");
+            scope.Start();
+            try
+            {
+                RequestContext context = new RequestContext
+                {
+                    CancellationToken = cancellationToken
+                };
+                HttpMessage message = _simplifiedSolutionsResourcesRestClient.CreateGetRequest(Id, simplifiedSolutionsResourceName, context);
+                Response result = await Pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
+                Response<SelfHelpSimplifiedSolutionsData> response = Response.FromValue(SelfHelpSimplifiedSolutionsData.FromResponse(result), result);
+                if (response.Value == null)
+                {
+                    throw new RequestFailedException(response.GetRawResponse());
+                }
+                return Response.FromValue(new SelfHelpSimplifiedSolutionsResource(Client, response.Value), response.GetRawResponse());
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// Get the simplified Solutions using the applicable solutionResourceName while creating the simplified Solutions.
+        /// <list type="bullet">
+        /// <item>
+        /// <term> Request Path. </term>
+        /// <description> /{scope}/providers/Microsoft.Help/simplifiedSolutions/{simplifiedSolutionsResourceName}. </description>
+        /// </item>
+        /// <item>
+        /// <term> Operation Id. </term>
+        /// <description> SimplifiedSolutionsResources_Get. </description>
+        /// </item>
+        /// <item>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="simplifiedSolutionsResourceName"> Simplified Solutions Resource Name. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="simplifiedSolutionsResourceName"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="simplifiedSolutionsResourceName"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual Response<SelfHelpSimplifiedSolutionsResource> Get(string simplifiedSolutionsResourceName, CancellationToken cancellationToken = default)
+        {
+            Argument.AssertNotNullOrEmpty(simplifiedSolutionsResourceName, nameof(simplifiedSolutionsResourceName));
+
+            using DiagnosticScope scope = _simplifiedSolutionsResourcesClientDiagnostics.CreateScope("SelfHelpSimplifiedSolutionsCollection.Get");
+            scope.Start();
+            try
+            {
+                RequestContext context = new RequestContext
+                {
+                    CancellationToken = cancellationToken
+                };
+                HttpMessage message = _simplifiedSolutionsResourcesRestClient.CreateGetRequest(Id, simplifiedSolutionsResourceName, context);
+                Response result = Pipeline.ProcessMessage(message, context);
+                Response<SelfHelpSimplifiedSolutionsData> response = Response.FromValue(SelfHelpSimplifiedSolutionsData.FromResponse(result), result);
+                if (response.Value == null)
+                {
+                    throw new RequestFailedException(response.GetRawResponse());
+                }
+                return Response.FromValue(new SelfHelpSimplifiedSolutionsResource(Client, response.Value), response.GetRawResponse());
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// Get the simplified Solutions using the applicable solutionResourceName while creating the simplified Solutions.
+        /// <list type="bullet">
+        /// <item>
+        /// <term> Request Path. </term>
+        /// <description> /{scope}/providers/Microsoft.Help/simplifiedSolutions/{simplifiedSolutionsResourceName}. </description>
+        /// </item>
+        /// <item>
+        /// <term> Operation Id. </term>
+        /// <description> SimplifiedSolutionsResources_Get. </description>
+        /// </item>
+        /// <item>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="simplifiedSolutionsResourceName"> Simplified Solutions Resource Name. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="simplifiedSolutionsResourceName"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="simplifiedSolutionsResourceName"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual async Task<Response<bool>> ExistsAsync(string simplifiedSolutionsResourceName, CancellationToken cancellationToken = default)
+        {
+            Argument.AssertNotNullOrEmpty(simplifiedSolutionsResourceName, nameof(simplifiedSolutionsResourceName));
+
+            using DiagnosticScope scope = _simplifiedSolutionsResourcesClientDiagnostics.CreateScope("SelfHelpSimplifiedSolutionsCollection.Exists");
+            scope.Start();
+            try
+            {
+                RequestContext context = new RequestContext
+                {
+                    CancellationToken = cancellationToken
+                };
+                HttpMessage message = _simplifiedSolutionsResourcesRestClient.CreateGetRequest(Id, simplifiedSolutionsResourceName, context);
+                await Pipeline.SendAsync(message, context.CancellationToken).ConfigureAwait(false);
+                Response result = message.Response;
+                Response<SelfHelpSimplifiedSolutionsData> response = default;
+                switch (result.Status)
+                {
+                    case 200:
+                        response = Response.FromValue(SelfHelpSimplifiedSolutionsData.FromResponse(result), result);
+                        break;
+                    case 404:
+                        response = Response.FromValue((SelfHelpSimplifiedSolutionsData)null, result);
+                        break;
+                    default:
+                        throw new RequestFailedException(result);
+                }
+                return Response.FromValue(response.Value != null, response.GetRawResponse());
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// Get the simplified Solutions using the applicable solutionResourceName while creating the simplified Solutions.
+        /// <list type="bullet">
+        /// <item>
+        /// <term> Request Path. </term>
+        /// <description> /{scope}/providers/Microsoft.Help/simplifiedSolutions/{simplifiedSolutionsResourceName}. </description>
+        /// </item>
+        /// <item>
+        /// <term> Operation Id. </term>
+        /// <description> SimplifiedSolutionsResources_Get. </description>
+        /// </item>
+        /// <item>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="simplifiedSolutionsResourceName"> Simplified Solutions Resource Name. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="simplifiedSolutionsResourceName"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="simplifiedSolutionsResourceName"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual Response<bool> Exists(string simplifiedSolutionsResourceName, CancellationToken cancellationToken = default)
+        {
+            Argument.AssertNotNullOrEmpty(simplifiedSolutionsResourceName, nameof(simplifiedSolutionsResourceName));
+
+            using DiagnosticScope scope = _simplifiedSolutionsResourcesClientDiagnostics.CreateScope("SelfHelpSimplifiedSolutionsCollection.Exists");
+            scope.Start();
+            try
+            {
+                RequestContext context = new RequestContext
+                {
+                    CancellationToken = cancellationToken
+                };
+                HttpMessage message = _simplifiedSolutionsResourcesRestClient.CreateGetRequest(Id, simplifiedSolutionsResourceName, context);
+                Pipeline.Send(message, context.CancellationToken);
+                Response result = message.Response;
+                Response<SelfHelpSimplifiedSolutionsData> response = default;
+                switch (result.Status)
+                {
+                    case 200:
+                        response = Response.FromValue(SelfHelpSimplifiedSolutionsData.FromResponse(result), result);
+                        break;
+                    case 404:
+                        response = Response.FromValue((SelfHelpSimplifiedSolutionsData)null, result);
+                        break;
+                    default:
+                        throw new RequestFailedException(result);
+                }
+                return Response.FromValue(response.Value != null, response.GetRawResponse());
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// Get the simplified Solutions using the applicable solutionResourceName while creating the simplified Solutions.
+        /// <list type="bullet">
+        /// <item>
+        /// <term> Request Path. </term>
+        /// <description> /{scope}/providers/Microsoft.Help/simplifiedSolutions/{simplifiedSolutionsResourceName}. </description>
+        /// </item>
+        /// <item>
+        /// <term> Operation Id. </term>
+        /// <description> SimplifiedSolutionsResources_Get. </description>
+        /// </item>
+        /// <item>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="simplifiedSolutionsResourceName"> Simplified Solutions Resource Name. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="simplifiedSolutionsResourceName"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="simplifiedSolutionsResourceName"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual async Task<NullableResponse<SelfHelpSimplifiedSolutionsResource>> GetIfExistsAsync(string simplifiedSolutionsResourceName, CancellationToken cancellationToken = default)
+        {
+            Argument.AssertNotNullOrEmpty(simplifiedSolutionsResourceName, nameof(simplifiedSolutionsResourceName));
+
+            using DiagnosticScope scope = _simplifiedSolutionsResourcesClientDiagnostics.CreateScope("SelfHelpSimplifiedSolutionsCollection.GetIfExists");
+            scope.Start();
+            try
+            {
+                RequestContext context = new RequestContext
+                {
+                    CancellationToken = cancellationToken
+                };
+                HttpMessage message = _simplifiedSolutionsResourcesRestClient.CreateGetRequest(Id, simplifiedSolutionsResourceName, context);
+                await Pipeline.SendAsync(message, context.CancellationToken).ConfigureAwait(false);
+                Response result = message.Response;
+                Response<SelfHelpSimplifiedSolutionsData> response = default;
+                switch (result.Status)
+                {
+                    case 200:
+                        response = Response.FromValue(SelfHelpSimplifiedSolutionsData.FromResponse(result), result);
+                        break;
+                    case 404:
+                        response = Response.FromValue((SelfHelpSimplifiedSolutionsData)null, result);
+                        break;
+                    default:
+                        throw new RequestFailedException(result);
+                }
+                if (response.Value == null)
+                {
+                    return new NoValueResponse<SelfHelpSimplifiedSolutionsResource>(response.GetRawResponse());
+                }
+                return Response.FromValue(new SelfHelpSimplifiedSolutionsResource(Client, response.Value), response.GetRawResponse());
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// Get the simplified Solutions using the applicable solutionResourceName while creating the simplified Solutions.
+        /// <list type="bullet">
+        /// <item>
+        /// <term> Request Path. </term>
+        /// <description> /{scope}/providers/Microsoft.Help/simplifiedSolutions/{simplifiedSolutionsResourceName}. </description>
+        /// </item>
+        /// <item>
+        /// <term> Operation Id. </term>
+        /// <description> SimplifiedSolutionsResources_Get. </description>
+        /// </item>
+        /// <item>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="simplifiedSolutionsResourceName"> Simplified Solutions Resource Name. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="simplifiedSolutionsResourceName"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="simplifiedSolutionsResourceName"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual NullableResponse<SelfHelpSimplifiedSolutionsResource> GetIfExists(string simplifiedSolutionsResourceName, CancellationToken cancellationToken = default)
+        {
+            Argument.AssertNotNullOrEmpty(simplifiedSolutionsResourceName, nameof(simplifiedSolutionsResourceName));
+
+            using DiagnosticScope scope = _simplifiedSolutionsResourcesClientDiagnostics.CreateScope("SelfHelpSimplifiedSolutionsCollection.GetIfExists");
+            scope.Start();
+            try
+            {
+                RequestContext context = new RequestContext
+                {
+                    CancellationToken = cancellationToken
+                };
+                HttpMessage message = _simplifiedSolutionsResourcesRestClient.CreateGetRequest(Id, simplifiedSolutionsResourceName, context);
+                Pipeline.Send(message, context.CancellationToken);
+                Response result = message.Response;
+                Response<SelfHelpSimplifiedSolutionsData> response = default;
+                switch (result.Status)
+                {
+                    case 200:
+                        response = Response.FromValue(SelfHelpSimplifiedSolutionsData.FromResponse(result), result);
+                        break;
+                    case 404:
+                        response = Response.FromValue((SelfHelpSimplifiedSolutionsData)null, result);
+                        break;
+                    default:
+                        throw new RequestFailedException(result);
+                }
+                if (response.Value == null)
+                {
+                    return new NoValueResponse<SelfHelpSimplifiedSolutionsResource>(response.GetRawResponse());
+                }
+                return Response.FromValue(new SelfHelpSimplifiedSolutionsResource(Client, response.Value), response.GetRawResponse());
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+    }
+}
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpSimplifiedSolutionsData.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpSimplifiedSolutionsData.Serialization.cs
new file mode 100644
index 000000000000..c24d02fc01be
--- /dev/null
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpSimplifiedSolutionsData.Serialization.cs
@@ -0,0 +1,196 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text;
+using System.Text.Json;
+using Azure;
+using Azure.Core;
+using Azure.ResourceManager.Models;
+using Azure.ResourceManager.SelfHelp.Models;
+
+namespace Azure.ResourceManager.SelfHelp
+{
+    /// <summary> Simplified Solutions response. </summary>
+    public partial class SelfHelpSimplifiedSolutionsData : ResourceData, IJsonModel<SelfHelpSimplifiedSolutionsData>
+    {
+        /// <param name="writer"> The JSON writer. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        void IJsonModel<SelfHelpSimplifiedSolutionsData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            writer.WriteStartObject();
+            JsonModelWriteCore(writer, options);
+            writer.WriteEndObject();
+        }
+
+        /// <param name="writer"> The JSON writer. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpSimplifiedSolutionsData>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(SelfHelpSimplifiedSolutionsData)} does not support writing '{format}' format.");
+            }
+            base.JsonModelWriteCore(writer, options);
+            if (Optional.IsDefined(Properties))
+            {
+                writer.WritePropertyName("properties"u8);
+                writer.WriteObjectValue(Properties, options);
+            }
+        }
+
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        SelfHelpSimplifiedSolutionsData IJsonModel<SelfHelpSimplifiedSolutionsData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => (SelfHelpSimplifiedSolutionsData)JsonModelCreateCore(ref reader, options);
+
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual ResourceData JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpSimplifiedSolutionsData>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(SelfHelpSimplifiedSolutionsData)} does not support reading '{format}' format.");
+            }
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeSelfHelpSimplifiedSolutionsData(document.RootElement, options);
+        }
+
+        /// <param name="element"> The JSON element to deserialize. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        internal static SelfHelpSimplifiedSolutionsData DeserializeSelfHelpSimplifiedSolutionsData(JsonElement element, ModelReaderWriterOptions options)
+        {
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            ResourceIdentifier id = default;
+            string name = default;
+            ResourceType resourceType = default;
+            SystemData systemData = default;
+            IDictionary<string, BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            SimplifiedSolutionsResourceProperties properties = default;
+            foreach (var prop in element.EnumerateObject())
+            {
+                if (prop.NameEquals("id"u8))
+                {
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    id = new ResourceIdentifier(prop.Value.GetString());
+                    continue;
+                }
+                if (prop.NameEquals("name"u8))
+                {
+                    name = prop.Value.GetString();
+                    continue;
+                }
+                if (prop.NameEquals("type"u8))
+                {
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    resourceType = new ResourceType(prop.Value.GetString());
+                    continue;
+                }
+                if (prop.NameEquals("systemData"u8))
+                {
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    systemData = ModelReaderWriter.Read<SystemData>(new BinaryData(Encoding.UTF8.GetBytes(prop.Value.GetRawText())), ModelSerializationExtensions.WireOptions, AzureResourceManagerSelfHelpContext.Default);
+                    continue;
+                }
+                if (prop.NameEquals("properties"u8))
+                {
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    properties = SimplifiedSolutionsResourceProperties.DeserializeSimplifiedSolutionsResourceProperties(prop.Value, options);
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText()));
+                }
+            }
+            return new SelfHelpSimplifiedSolutionsData(
+                id,
+                name,
+                resourceType,
+                systemData,
+                additionalBinaryDataProperties,
+                properties);
+        }
+
+        /// <param name="options"> The client options for reading and writing models. </param>
+        BinaryData IPersistableModel<SelfHelpSimplifiedSolutionsData>.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
+
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpSimplifiedSolutionsData>)this).GetFormatFromOptions(options) : options.Format;
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options, AzureResourceManagerSelfHelpContext.Default);
+                default:
+                    throw new FormatException($"The model {nameof(SelfHelpSimplifiedSolutionsData)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        SelfHelpSimplifiedSolutionsData IPersistableModel<SelfHelpSimplifiedSolutionsData>.Create(BinaryData data, ModelReaderWriterOptions options) => (SelfHelpSimplifiedSolutionsData)PersistableModelCreateCore(data, options);
+
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual ResourceData PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpSimplifiedSolutionsData>)this).GetFormatFromOptions(options) : options.Format;
+            switch (format)
+            {
+                case "J":
+                    using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
+                    {
+                        return DeserializeSelfHelpSimplifiedSolutionsData(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(SelfHelpSimplifiedSolutionsData)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        /// <param name="options"> The client options for reading and writing models. </param>
+        string IPersistableModel<SelfHelpSimplifiedSolutionsData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <param name="selfHelpSimplifiedSolutionsData"> The <see cref="SelfHelpSimplifiedSolutionsData"/> to serialize into <see cref="RequestContent"/>. </param>
+        internal static RequestContent ToRequestContent(SelfHelpSimplifiedSolutionsData selfHelpSimplifiedSolutionsData)
+        {
+            if (selfHelpSimplifiedSolutionsData == null)
+            {
+                return null;
+            }
+            Utf8JsonRequestContent content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(selfHelpSimplifiedSolutionsData, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+
+        /// <param name="response"> The <see cref="Response"/> to deserialize the <see cref="SelfHelpSimplifiedSolutionsData"/> from. </param>
+        internal static SelfHelpSimplifiedSolutionsData FromResponse(Response response)
+        {
+            using JsonDocument document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions);
+            return DeserializeSelfHelpSimplifiedSolutionsData(document.RootElement, ModelSerializationExtensions.WireOptions);
+        }
+    }
+}
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpSimplifiedSolutionsData.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpSimplifiedSolutionsData.cs
new file mode 100644
index 000000000000..983e09b69a56
--- /dev/null
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpSimplifiedSolutionsData.cs
@@ -0,0 +1,113 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+using Azure.Core;
+using Azure.ResourceManager.Models;
+using Azure.ResourceManager.SelfHelp.Models;
+
+namespace Azure.ResourceManager.SelfHelp
+{
+    /// <summary> Simplified Solutions response. </summary>
+    public partial class SelfHelpSimplifiedSolutionsData : ResourceData
+    {
+        /// <summary> Keeps track of any properties unknown to the library. </summary>
+        private protected readonly IDictionary<string, BinaryData> _additionalBinaryDataProperties;
+
+        /// <summary> Initializes a new instance of <see cref="SelfHelpSimplifiedSolutionsData"/>. </summary>
+        public SelfHelpSimplifiedSolutionsData()
+        {
+        }
+
+        /// <summary> Initializes a new instance of <see cref="SelfHelpSimplifiedSolutionsData"/>. </summary>
+        /// <param name="id"> Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. </param>
+        /// <param name="name"> The name of the resource. </param>
+        /// <param name="resourceType"> The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts". </param>
+        /// <param name="systemData"> Azure Resource Manager metadata containing createdBy and modifiedBy information. </param>
+        /// <param name="additionalBinaryDataProperties"> Keeps track of any properties unknown to the library. </param>
+        /// <param name="properties"> Simplified Solutions result. </param>
+        internal SelfHelpSimplifiedSolutionsData(ResourceIdentifier id, string name, ResourceType resourceType, SystemData systemData, IDictionary<string, BinaryData> additionalBinaryDataProperties, SimplifiedSolutionsResourceProperties properties) : base(id, name, resourceType, systemData)
+        {
+            _additionalBinaryDataProperties = additionalBinaryDataProperties;
+            Properties = properties;
+        }
+
+        /// <summary> Simplified Solutions result. </summary>
+        internal SimplifiedSolutionsResourceProperties Properties { get; set; }
+
+        /// <summary> Solution Id to identify single Simplified Solution. </summary>
+        public string SolutionId
+        {
+            get
+            {
+                return Properties is null ? default : Properties.SolutionId;
+            }
+            set
+            {
+                if (Properties is null)
+                {
+                    Properties = new SimplifiedSolutionsResourceProperties();
+                }
+                Properties.SolutionId = value;
+            }
+        }
+
+        /// <summary> Client input parameters to run Simplified Solutions. </summary>
+        public IDictionary<string, string> Parameters
+        {
+            get
+            {
+                if (Properties is null)
+                {
+                    Properties = new SimplifiedSolutionsResourceProperties();
+                }
+                return Properties.Parameters;
+            }
+        }
+
+        /// <summary> The title. </summary>
+        public string Title
+        {
+            get
+            {
+                return Properties is null ? default : Properties.Title;
+            }
+        }
+
+        /// <summary> Additional parameter response for Simplified Solutions. </summary>
+        public IReadOnlyDictionary<string, string> Appendix
+        {
+            get
+            {
+                if (Properties is null)
+                {
+                    Properties = new SimplifiedSolutionsResourceProperties();
+                }
+                return Properties.Appendix;
+            }
+        }
+
+        /// <summary> The HTML content that needs to be rendered and shown to customer. </summary>
+        public string Content
+        {
+            get
+            {
+                return Properties is null ? default : Properties.Content;
+            }
+        }
+
+        /// <summary> Status of Simplified Solution provisioning. </summary>
+        public SolutionProvisioningState? ProvisioningState
+        {
+            get
+            {
+                return Properties is null ? default : Properties.ProvisioningState;
+            }
+        }
+    }
+}
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpSimplifiedSolutionsResource.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpSimplifiedSolutionsResource.Serialization.cs
new file mode 100644
index 000000000000..228eac2872f4
--- /dev/null
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpSimplifiedSolutionsResource.Serialization.cs
@@ -0,0 +1,39 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Text.Json;
+
+namespace Azure.ResourceManager.SelfHelp
+{
+    /// <summary></summary>
+    public partial class SelfHelpSimplifiedSolutionsResource : IJsonModel<SelfHelpSimplifiedSolutionsData>
+    {
+        private static IJsonModel<SelfHelpSimplifiedSolutionsData> s_dataDeserializationInstance;
+
+        private static IJsonModel<SelfHelpSimplifiedSolutionsData> DataDeserializationInstance => s_dataDeserializationInstance ??= new SelfHelpSimplifiedSolutionsData();
+
+        /// <param name="writer"> The writer to serialize the model to. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        void IJsonModel<SelfHelpSimplifiedSolutionsData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => ((IJsonModel<SelfHelpSimplifiedSolutionsData>)Data).Write(writer, options);
+
+        /// <param name="reader"> The reader for deserializing the model. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        SelfHelpSimplifiedSolutionsData IJsonModel<SelfHelpSimplifiedSolutionsData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => DataDeserializationInstance.Create(ref reader, options);
+
+        /// <param name="options"> The client options for reading and writing models. </param>
+        BinaryData IPersistableModel<SelfHelpSimplifiedSolutionsData>.Write(ModelReaderWriterOptions options) => ModelReaderWriter.Write<SelfHelpSimplifiedSolutionsData>(Data, options, AzureResourceManagerSelfHelpContext.Default);
+
+        /// <param name="data"> The binary data to be processed. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        SelfHelpSimplifiedSolutionsData IPersistableModel<SelfHelpSimplifiedSolutionsData>.Create(BinaryData data, ModelReaderWriterOptions options) => ModelReaderWriter.Read<SelfHelpSimplifiedSolutionsData>(data, options, AzureResourceManagerSelfHelpContext.Default);
+
+        /// <param name="options"> The client options for reading and writing models. </param>
+        string IPersistableModel<SelfHelpSimplifiedSolutionsData>.GetFormatFromOptions(ModelReaderWriterOptions options) => DataDeserializationInstance.GetFormatFromOptions(options);
+    }
+}
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpSimplifiedSolutionsResource.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpSimplifiedSolutionsResource.cs
new file mode 100644
index 000000000000..ff5d249feadd
--- /dev/null
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpSimplifiedSolutionsResource.cs
@@ -0,0 +1,300 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Diagnostics;
+using System.Threading;
+using System.Threading.Tasks;
+using Azure;
+using Azure.Core;
+using Azure.Core.Pipeline;
+using Azure.ResourceManager;
+
+namespace Azure.ResourceManager.SelfHelp
+{
+    /// <summary>
+    /// A class representing a SelfHelpSimplifiedSolutions along with the instance operations that can be performed on it.
+    /// If you have a <see cref="ResourceIdentifier"/> you can construct a <see cref="SelfHelpSimplifiedSolutionsResource"/> from an instance of <see cref="ArmClient"/> using the GetResource method.
+    /// Otherwise you can get one from its parent resource <see cref="ArmResource"/> using the GetSelfHelpSimplifiedSolutions method.
+    /// </summary>
+    public partial class SelfHelpSimplifiedSolutionsResource : ArmResource
+    {
+        private readonly ClientDiagnostics _simplifiedSolutionsResourcesClientDiagnostics;
+        private readonly SimplifiedSolutionsResources _simplifiedSolutionsResourcesRestClient;
+        private readonly SelfHelpSimplifiedSolutionsData _data;
+        /// <summary> Gets the resource type for the operations. </summary>
+        public static readonly ResourceType ResourceType = "Microsoft.Help/simplifiedSolutions";
+
+        /// <summary> Initializes a new instance of SelfHelpSimplifiedSolutionsResource for mocking. </summary>
+        protected SelfHelpSimplifiedSolutionsResource()
+        {
+        }
+
+        /// <summary> Initializes a new instance of <see cref="SelfHelpSimplifiedSolutionsResource"/> class. </summary>
+        /// <param name="client"> The client parameters to use in these operations. </param>
+        /// <param name="data"> The resource that is the target of operations. </param>
+        internal SelfHelpSimplifiedSolutionsResource(ArmClient client, SelfHelpSimplifiedSolutionsData data) : this(client, data.Id)
+        {
+            HasData = true;
+            _data = data;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="SelfHelpSimplifiedSolutionsResource"/> class. </summary>
+        /// <param name="client"> The client parameters to use in these operations. </param>
+        /// <param name="id"> The identifier of the resource that is the target of operations. </param>
+        internal SelfHelpSimplifiedSolutionsResource(ArmClient client, ResourceIdentifier id) : base(client, id)
+        {
+            TryGetApiVersion(ResourceType, out string selfHelpSimplifiedSolutionsApiVersion);
+            _simplifiedSolutionsResourcesClientDiagnostics = new ClientDiagnostics("Azure.ResourceManager.SelfHelp", ResourceType.Namespace, Diagnostics);
+            _simplifiedSolutionsResourcesRestClient = new SimplifiedSolutionsResources(_simplifiedSolutionsResourcesClientDiagnostics, Pipeline, Endpoint, selfHelpSimplifiedSolutionsApiVersion ?? "2024-03-01-preview");
+            ValidateResourceId(id);
+        }
+
+        /// <summary> Gets whether or not the current instance has data. </summary>
+        public virtual bool HasData { get; }
+
+        /// <summary> Gets the data representing this Feature. </summary>
+        public virtual SelfHelpSimplifiedSolutionsData Data
+        {
+            get
+            {
+                if (!HasData)
+                {
+                    throw new InvalidOperationException("The current instance does not have data, you must call Get first.");
+                }
+                return _data;
+            }
+        }
+
+        /// <summary> Generate the resource identifier for this resource. </summary>
+        /// <param name="scope"> The scope. </param>
+        /// <param name="simplifiedSolutionsResourceName"> The simplifiedSolutionsResourceName. </param>
+        public static ResourceIdentifier CreateResourceIdentifier(string scope, string simplifiedSolutionsResourceName)
+        {
+            string resourceId = $"{scope}/providers/Microsoft.Help/simplifiedSolutions/{simplifiedSolutionsResourceName}";
+            return new ResourceIdentifier(resourceId);
+        }
+
+        /// <param name="id"></param>
+        [Conditional("DEBUG")]
+        internal static void ValidateResourceId(ResourceIdentifier id)
+        {
+            if (id.ResourceType != ResourceType)
+            {
+                throw new ArgumentException(string.Format("Invalid resource type {0} expected {1}", id.ResourceType, ResourceType), id);
+            }
+        }
+
+        /// <summary>
+        /// Get the simplified Solutions using the applicable solutionResourceName while creating the simplified Solutions.
+        /// <list type="bullet">
+        /// <item>
+        /// <term> Request Path. </term>
+        /// <description> /{scope}/providers/Microsoft.Help/simplifiedSolutions/{simplifiedSolutionsResourceName}. </description>
+        /// </item>
+        /// <item>
+        /// <term> Operation Id. </term>
+        /// <description> SimplifiedSolutionsResources_Get. </description>
+        /// </item>
+        /// <item>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
+        /// </item>
+        /// <item>
+        /// <term> Resource. </term>
+        /// <description> <see cref="SelfHelpSimplifiedSolutionsResource"/>. </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        public virtual async Task<Response<SelfHelpSimplifiedSolutionsResource>> GetAsync(CancellationToken cancellationToken = default)
+        {
+            using DiagnosticScope scope = _simplifiedSolutionsResourcesClientDiagnostics.CreateScope("SelfHelpSimplifiedSolutionsResource.Get");
+            scope.Start();
+            try
+            {
+                RequestContext context = new RequestContext
+                {
+                    CancellationToken = cancellationToken
+                };
+                HttpMessage message = _simplifiedSolutionsResourcesRestClient.CreateGetRequest(Id.Parent, Id.Name, context);
+                Response result = await Pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
+                Response<SelfHelpSimplifiedSolutionsData> response = Response.FromValue(SelfHelpSimplifiedSolutionsData.FromResponse(result), result);
+                if (response.Value == null)
+                {
+                    throw new RequestFailedException(response.GetRawResponse());
+                }
+                return Response.FromValue(new SelfHelpSimplifiedSolutionsResource(Client, response.Value), response.GetRawResponse());
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// Get the simplified Solutions using the applicable solutionResourceName while creating the simplified Solutions.
+        /// <list type="bullet">
+        /// <item>
+        /// <term> Request Path. </term>
+        /// <description> /{scope}/providers/Microsoft.Help/simplifiedSolutions/{simplifiedSolutionsResourceName}. </description>
+        /// </item>
+        /// <item>
+        /// <term> Operation Id. </term>
+        /// <description> SimplifiedSolutionsResources_Get. </description>
+        /// </item>
+        /// <item>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
+        /// </item>
+        /// <item>
+        /// <term> Resource. </term>
+        /// <description> <see cref="SelfHelpSimplifiedSolutionsResource"/>. </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        public virtual Response<SelfHelpSimplifiedSolutionsResource> Get(CancellationToken cancellationToken = default)
+        {
+            using DiagnosticScope scope = _simplifiedSolutionsResourcesClientDiagnostics.CreateScope("SelfHelpSimplifiedSolutionsResource.Get");
+            scope.Start();
+            try
+            {
+                RequestContext context = new RequestContext
+                {
+                    CancellationToken = cancellationToken
+                };
+                HttpMessage message = _simplifiedSolutionsResourcesRestClient.CreateGetRequest(Id.Parent, Id.Name, context);
+                Response result = Pipeline.ProcessMessage(message, context);
+                Response<SelfHelpSimplifiedSolutionsData> response = Response.FromValue(SelfHelpSimplifiedSolutionsData.FromResponse(result), result);
+                if (response.Value == null)
+                {
+                    throw new RequestFailedException(response.GetRawResponse());
+                }
+                return Response.FromValue(new SelfHelpSimplifiedSolutionsResource(Client, response.Value), response.GetRawResponse());
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// Creates Simplified Solutions for an Azure subscription using 'solutionId' from Discovery Solutions as the input. &lt;br/&gt;&lt;br/&gt; Simplified Solutions API makes the consumption of solutions APIs easier while still providing access to the same powerful solutions rendered in Solutions API. With Simplified Solutions, users don't have to worry about stitching together the article using replacement maps and can use the content in the API response to directly render as HTML content.&lt;br/&gt;
+        /// <list type="bullet">
+        /// <item>
+        /// <term> Request Path. </term>
+        /// <description> /{scope}/providers/Microsoft.Help/simplifiedSolutions/{simplifiedSolutionsResourceName}. </description>
+        /// </item>
+        /// <item>
+        /// <term> Operation Id. </term>
+        /// <description> SimplifiedSolutionsResources_Create. </description>
+        /// </item>
+        /// <item>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
+        /// </item>
+        /// <item>
+        /// <term> Resource. </term>
+        /// <description> <see cref="SelfHelpSimplifiedSolutionsResource"/>. </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="waitUntil"> <see cref="WaitUntil.Completed"/> if the method should wait to return until the long-running operation has completed on the service; <see cref="WaitUntil.Started"/> if it should return after starting the operation. For more information on long-running operations, please see <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/LongRunningOperations.md"> Azure.Core Long-Running Operation samples</see>. </param>
+        /// <param name="data"> The required request body for simplified Solutions resource creation. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        public virtual async Task<ArmOperation<SelfHelpSimplifiedSolutionsResource>> UpdateAsync(WaitUntil waitUntil, SelfHelpSimplifiedSolutionsData data = default, CancellationToken cancellationToken = default)
+        {
+            using DiagnosticScope scope = _simplifiedSolutionsResourcesClientDiagnostics.CreateScope("SelfHelpSimplifiedSolutionsResource.Update");
+            scope.Start();
+            try
+            {
+                RequestContext context = new RequestContext
+                {
+                    CancellationToken = cancellationToken
+                };
+                HttpMessage message = _simplifiedSolutionsResourcesRestClient.CreateCreateRequest(Id.Parent, Id.Name, SelfHelpSimplifiedSolutionsData.ToRequestContent(data), context);
+                Response response = await Pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
+                SelfHelpArmOperation<SelfHelpSimplifiedSolutionsResource> operation = new SelfHelpArmOperation<SelfHelpSimplifiedSolutionsResource>(
+                    new SelfHelpSimplifiedSolutionsOperationSource(Client),
+                    _simplifiedSolutionsResourcesClientDiagnostics,
+                    Pipeline,
+                    message.Request,
+                    response,
+                    OperationFinalStateVia.AzureAsyncOperation);
+                if (waitUntil == WaitUntil.Completed)
+                {
+                    await operation.WaitForCompletionAsync(cancellationToken).ConfigureAwait(false);
+                }
+                return operation;
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// Creates Simplified Solutions for an Azure subscription using 'solutionId' from Discovery Solutions as the input. &lt;br/&gt;&lt;br/&gt; Simplified Solutions API makes the consumption of solutions APIs easier while still providing access to the same powerful solutions rendered in Solutions API. With Simplified Solutions, users don't have to worry about stitching together the article using replacement maps and can use the content in the API response to directly render as HTML content.&lt;br/&gt;
+        /// <list type="bullet">
+        /// <item>
+        /// <term> Request Path. </term>
+        /// <description> /{scope}/providers/Microsoft.Help/simplifiedSolutions/{simplifiedSolutionsResourceName}. </description>
+        /// </item>
+        /// <item>
+        /// <term> Operation Id. </term>
+        /// <description> SimplifiedSolutionsResources_Create. </description>
+        /// </item>
+        /// <item>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
+        /// </item>
+        /// <item>
+        /// <term> Resource. </term>
+        /// <description> <see cref="SelfHelpSimplifiedSolutionsResource"/>. </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="waitUntil"> <see cref="WaitUntil.Completed"/> if the method should wait to return until the long-running operation has completed on the service; <see cref="WaitUntil.Started"/> if it should return after starting the operation. For more information on long-running operations, please see <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/LongRunningOperations.md"> Azure.Core Long-Running Operation samples</see>. </param>
+        /// <param name="data"> The required request body for simplified Solutions resource creation. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        public virtual ArmOperation<SelfHelpSimplifiedSolutionsResource> Update(WaitUntil waitUntil, SelfHelpSimplifiedSolutionsData data = default, CancellationToken cancellationToken = default)
+        {
+            using DiagnosticScope scope = _simplifiedSolutionsResourcesClientDiagnostics.CreateScope("SelfHelpSimplifiedSolutionsResource.Update");
+            scope.Start();
+            try
+            {
+                RequestContext context = new RequestContext
+                {
+                    CancellationToken = cancellationToken
+                };
+                HttpMessage message = _simplifiedSolutionsResourcesRestClient.CreateCreateRequest(Id.Parent, Id.Name, SelfHelpSimplifiedSolutionsData.ToRequestContent(data), context);
+                Response response = Pipeline.ProcessMessage(message, context);
+                SelfHelpArmOperation<SelfHelpSimplifiedSolutionsResource> operation = new SelfHelpArmOperation<SelfHelpSimplifiedSolutionsResource>(
+                    new SelfHelpSimplifiedSolutionsOperationSource(Client),
+                    _simplifiedSolutionsResourcesClientDiagnostics,
+                    Pipeline,
+                    message.Request,
+                    response,
+                    OperationFinalStateVia.AzureAsyncOperation);
+                if (waitUntil == WaitUntil.Completed)
+                {
+                    operation.WaitForCompletion(cancellationToken);
+                }
+                return operation;
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+    }
+}
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpSolutionCollection.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpSolutionCollection.cs
index 295b803f3f36..f098fc402deb 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpSolutionCollection.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpSolutionCollection.cs
@@ -8,8 +8,10 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
+using Azure;
 using Azure.Core;
 using Azure.Core.Pipeline;
+using Azure.ResourceManager;
 
 namespace Azure.ResourceManager.SelfHelp
 {
@@ -20,42 +22,38 @@ namespace Azure.ResourceManager.SelfHelp
     /// </summary>
     public partial class SelfHelpSolutionCollection : ArmCollection
     {
-        private readonly ClientDiagnostics _selfHelpSolutionSolutionResourcesClientDiagnostics;
-        private readonly SolutionResourcesRestOperations _selfHelpSolutionSolutionResourcesRestClient;
+        private readonly ClientDiagnostics _solutionResourcesClientDiagnostics;
+        private readonly SolutionResources _solutionResourcesRestClient;
 
-        /// <summary> Initializes a new instance of the <see cref="SelfHelpSolutionCollection"/> class for mocking. </summary>
+        /// <summary> Initializes a new instance of SelfHelpSolutionCollection for mocking. </summary>
         protected SelfHelpSolutionCollection()
         {
         }
 
-        /// <summary> Initializes a new instance of the <see cref="SelfHelpSolutionCollection"/> class. </summary>
+        /// <summary> Initializes a new instance of <see cref="SelfHelpSolutionCollection"/> class. </summary>
         /// <param name="client"> The client parameters to use in these operations. </param>
-        /// <param name="id"> The identifier of the parent resource that is the target of operations. </param>
+        /// <param name="id"> The identifier of the resource that is the target of operations. </param>
         internal SelfHelpSolutionCollection(ArmClient client, ResourceIdentifier id) : base(client, id)
         {
-            _selfHelpSolutionSolutionResourcesClientDiagnostics = new ClientDiagnostics("Azure.ResourceManager.SelfHelp", SelfHelpSolutionResource.ResourceType.Namespace, Diagnostics);
-            TryGetApiVersion(SelfHelpSolutionResource.ResourceType, out string selfHelpSolutionSolutionResourcesApiVersion);
-            _selfHelpSolutionSolutionResourcesRestClient = new SolutionResourcesRestOperations(Pipeline, Diagnostics.ApplicationId, Endpoint, selfHelpSolutionSolutionResourcesApiVersion);
+            TryGetApiVersion(SelfHelpSolutionResource.ResourceType, out string selfHelpSolutionApiVersion);
+            _solutionResourcesClientDiagnostics = new ClientDiagnostics("Azure.ResourceManager.SelfHelp", SelfHelpSolutionResource.ResourceType.Namespace, Diagnostics);
+            _solutionResourcesRestClient = new SolutionResources(_solutionResourcesClientDiagnostics, Pipeline, Endpoint, selfHelpSolutionApiVersion ?? "2024-03-01-preview");
         }
 
         /// <summary>
         /// Creates a solution for the specific Azure resource or subscription using the inputs ‘solutionId and requiredInputs’ from discovery solutions. &lt;br/&gt; Azure solutions comprise a comprehensive library of self-help resources that have been thoughtfully curated by Azure engineers to aid customers in resolving typical troubleshooting issues. These solutions encompass: &lt;br/&gt; (1.) Dynamic and context-aware diagnostics, guided troubleshooting wizards, and data visualizations. &lt;br/&gt; (2.) Rich instructional video tutorials and illustrative diagrams and images. &lt;br/&gt; (3.) Thoughtfully assembled textual troubleshooting instructions. &lt;br/&gt; All these components are seamlessly converged into unified solutions tailored to address a specific support problem area.
         /// <list type="bullet">
         /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/solutions/{solutionResourceName}</description>
+        /// <term> Request Path. </term>
+        /// <description> /{scope}/providers/Microsoft.Help/solutions/{solutionResourceName}. </description>
         /// </item>
         /// <item>
-        /// <term>Operation Id</term>
-        /// <description>SolutionResource_Create</description>
+        /// <term> Operation Id. </term>
+        /// <description> SolutionResources_Create. </description>
         /// </item>
         /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
-        /// </item>
-        /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpSolutionResource"/></description>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
         /// </item>
         /// </list>
         /// </summary>
@@ -63,21 +61,33 @@ internal SelfHelpSolutionCollection(ArmClient client, ResourceIdentifier id) : b
         /// <param name="solutionResourceName"> Solution resource Name. </param>
         /// <param name="data"> The required request body for this solution resource creation. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="solutionResourceName"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="solutionResourceName"/> is an empty string, and was expected to be non-empty. </exception>
-        /// <exception cref="ArgumentNullException"> <paramref name="solutionResourceName"/> or <paramref name="data"/> is null. </exception>
-        public virtual async Task<ArmOperation<SelfHelpSolutionResource>> CreateOrUpdateAsync(WaitUntil waitUntil, string solutionResourceName, SelfHelpSolutionData data, CancellationToken cancellationToken = default)
+        public virtual async Task<ArmOperation<SelfHelpSolutionResource>> CreateOrUpdateAsync(WaitUntil waitUntil, string solutionResourceName, SelfHelpSolutionData data = default, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(solutionResourceName, nameof(solutionResourceName));
-            Argument.AssertNotNull(data, nameof(data));
 
-            using var scope = _selfHelpSolutionSolutionResourcesClientDiagnostics.CreateScope("SelfHelpSolutionCollection.CreateOrUpdate");
+            using DiagnosticScope scope = _solutionResourcesClientDiagnostics.CreateScope("SelfHelpSolutionCollection.CreateOrUpdate");
             scope.Start();
             try
             {
-                var response = await _selfHelpSolutionSolutionResourcesRestClient.CreateAsync(Id, solutionResourceName, data, cancellationToken).ConfigureAwait(false);
-                var operation = new SelfHelpArmOperation<SelfHelpSolutionResource>(new SelfHelpSolutionOperationSource(Client), _selfHelpSolutionSolutionResourcesClientDiagnostics, Pipeline, _selfHelpSolutionSolutionResourcesRestClient.CreateCreateRequest(Id, solutionResourceName, data).Request, response, OperationFinalStateVia.AzureAsyncOperation);
+                RequestContext context = new RequestContext
+                {
+                    CancellationToken = cancellationToken
+                };
+                HttpMessage message = _solutionResourcesRestClient.CreateCreateRequest(Id, solutionResourceName, SelfHelpSolutionData.ToRequestContent(data), context);
+                Response response = await Pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
+                SelfHelpArmOperation<SelfHelpSolutionResource> operation = new SelfHelpArmOperation<SelfHelpSolutionResource>(
+                    new SelfHelpSolutionOperationSource(Client),
+                    _solutionResourcesClientDiagnostics,
+                    Pipeline,
+                    message.Request,
+                    response,
+                    OperationFinalStateVia.AzureAsyncOperation);
                 if (waitUntil == WaitUntil.Completed)
+                {
                     await operation.WaitForCompletionAsync(cancellationToken).ConfigureAwait(false);
+                }
                 return operation;
             }
             catch (Exception e)
@@ -91,20 +101,16 @@ public virtual async Task<ArmOperation<SelfHelpSolutionResource>> CreateOrUpdate
         /// Creates a solution for the specific Azure resource or subscription using the inputs ‘solutionId and requiredInputs’ from discovery solutions. &lt;br/&gt; Azure solutions comprise a comprehensive library of self-help resources that have been thoughtfully curated by Azure engineers to aid customers in resolving typical troubleshooting issues. These solutions encompass: &lt;br/&gt; (1.) Dynamic and context-aware diagnostics, guided troubleshooting wizards, and data visualizations. &lt;br/&gt; (2.) Rich instructional video tutorials and illustrative diagrams and images. &lt;br/&gt; (3.) Thoughtfully assembled textual troubleshooting instructions. &lt;br/&gt; All these components are seamlessly converged into unified solutions tailored to address a specific support problem area.
         /// <list type="bullet">
         /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/solutions/{solutionResourceName}</description>
-        /// </item>
-        /// <item>
-        /// <term>Operation Id</term>
-        /// <description>SolutionResource_Create</description>
+        /// <term> Request Path. </term>
+        /// <description> /{scope}/providers/Microsoft.Help/solutions/{solutionResourceName}. </description>
         /// </item>
         /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
+        /// <term> Operation Id. </term>
+        /// <description> SolutionResources_Create. </description>
         /// </item>
         /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpSolutionResource"/></description>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
         /// </item>
         /// </list>
         /// </summary>
@@ -112,21 +118,33 @@ public virtual async Task<ArmOperation<SelfHelpSolutionResource>> CreateOrUpdate
         /// <param name="solutionResourceName"> Solution resource Name. </param>
         /// <param name="data"> The required request body for this solution resource creation. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="solutionResourceName"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="solutionResourceName"/> is an empty string, and was expected to be non-empty. </exception>
-        /// <exception cref="ArgumentNullException"> <paramref name="solutionResourceName"/> or <paramref name="data"/> is null. </exception>
-        public virtual ArmOperation<SelfHelpSolutionResource> CreateOrUpdate(WaitUntil waitUntil, string solutionResourceName, SelfHelpSolutionData data, CancellationToken cancellationToken = default)
+        public virtual ArmOperation<SelfHelpSolutionResource> CreateOrUpdate(WaitUntil waitUntil, string solutionResourceName, SelfHelpSolutionData data = default, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(solutionResourceName, nameof(solutionResourceName));
-            Argument.AssertNotNull(data, nameof(data));
 
-            using var scope = _selfHelpSolutionSolutionResourcesClientDiagnostics.CreateScope("SelfHelpSolutionCollection.CreateOrUpdate");
+            using DiagnosticScope scope = _solutionResourcesClientDiagnostics.CreateScope("SelfHelpSolutionCollection.CreateOrUpdate");
             scope.Start();
             try
             {
-                var response = _selfHelpSolutionSolutionResourcesRestClient.Create(Id, solutionResourceName, data, cancellationToken);
-                var operation = new SelfHelpArmOperation<SelfHelpSolutionResource>(new SelfHelpSolutionOperationSource(Client), _selfHelpSolutionSolutionResourcesClientDiagnostics, Pipeline, _selfHelpSolutionSolutionResourcesRestClient.CreateCreateRequest(Id, solutionResourceName, data).Request, response, OperationFinalStateVia.AzureAsyncOperation);
+                RequestContext context = new RequestContext
+                {
+                    CancellationToken = cancellationToken
+                };
+                HttpMessage message = _solutionResourcesRestClient.CreateCreateRequest(Id, solutionResourceName, SelfHelpSolutionData.ToRequestContent(data), context);
+                Response response = Pipeline.ProcessMessage(message, context);
+                SelfHelpArmOperation<SelfHelpSolutionResource> operation = new SelfHelpArmOperation<SelfHelpSolutionResource>(
+                    new SelfHelpSolutionOperationSource(Client),
+                    _solutionResourcesClientDiagnostics,
+                    Pipeline,
+                    message.Request,
+                    response,
+                    OperationFinalStateVia.AzureAsyncOperation);
                 if (waitUntil == WaitUntil.Completed)
+                {
                     operation.WaitForCompletion(cancellationToken);
+                }
                 return operation;
             }
             catch (Exception e)
@@ -140,38 +158,42 @@ public virtual ArmOperation<SelfHelpSolutionResource> CreateOrUpdate(WaitUntil w
         /// Get the solution using the applicable solutionResourceName while creating the solution.
         /// <list type="bullet">
         /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/solutions/{solutionResourceName}</description>
-        /// </item>
-        /// <item>
-        /// <term>Operation Id</term>
-        /// <description>SolutionResource_Get</description>
+        /// <term> Request Path. </term>
+        /// <description> /{scope}/providers/Microsoft.Help/solutions/{solutionResourceName}. </description>
         /// </item>
         /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
+        /// <term> Operation Id. </term>
+        /// <description> SolutionResources_Get. </description>
         /// </item>
         /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpSolutionResource"/></description>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="solutionResourceName"> Solution resource Name. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentException"> <paramref name="solutionResourceName"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="ArgumentNullException"> <paramref name="solutionResourceName"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="solutionResourceName"/> is an empty string, and was expected to be non-empty. </exception>
         public virtual async Task<Response<SelfHelpSolutionResource>> GetAsync(string solutionResourceName, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(solutionResourceName, nameof(solutionResourceName));
 
-            using var scope = _selfHelpSolutionSolutionResourcesClientDiagnostics.CreateScope("SelfHelpSolutionCollection.Get");
+            using DiagnosticScope scope = _solutionResourcesClientDiagnostics.CreateScope("SelfHelpSolutionCollection.Get");
             scope.Start();
             try
             {
-                var response = await _selfHelpSolutionSolutionResourcesRestClient.GetAsync(Id, solutionResourceName, cancellationToken).ConfigureAwait(false);
+                RequestContext context = new RequestContext
+                {
+                    CancellationToken = cancellationToken
+                };
+                HttpMessage message = _solutionResourcesRestClient.CreateGetRequest(Id, solutionResourceName, context);
+                Response result = await Pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
+                Response<SelfHelpSolutionData> response = Response.FromValue(SelfHelpSolutionData.FromResponse(result), result);
                 if (response.Value == null)
+                {
                     throw new RequestFailedException(response.GetRawResponse());
+                }
                 return Response.FromValue(new SelfHelpSolutionResource(Client, response.Value), response.GetRawResponse());
             }
             catch (Exception e)
@@ -185,38 +207,42 @@ public virtual async Task<Response<SelfHelpSolutionResource>> GetAsync(string so
         /// Get the solution using the applicable solutionResourceName while creating the solution.
         /// <list type="bullet">
         /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/solutions/{solutionResourceName}</description>
-        /// </item>
-        /// <item>
-        /// <term>Operation Id</term>
-        /// <description>SolutionResource_Get</description>
+        /// <term> Request Path. </term>
+        /// <description> /{scope}/providers/Microsoft.Help/solutions/{solutionResourceName}. </description>
         /// </item>
         /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
+        /// <term> Operation Id. </term>
+        /// <description> SolutionResources_Get. </description>
         /// </item>
         /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpSolutionResource"/></description>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="solutionResourceName"> Solution resource Name. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentException"> <paramref name="solutionResourceName"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="ArgumentNullException"> <paramref name="solutionResourceName"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="solutionResourceName"/> is an empty string, and was expected to be non-empty. </exception>
         public virtual Response<SelfHelpSolutionResource> Get(string solutionResourceName, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(solutionResourceName, nameof(solutionResourceName));
 
-            using var scope = _selfHelpSolutionSolutionResourcesClientDiagnostics.CreateScope("SelfHelpSolutionCollection.Get");
+            using DiagnosticScope scope = _solutionResourcesClientDiagnostics.CreateScope("SelfHelpSolutionCollection.Get");
             scope.Start();
             try
             {
-                var response = _selfHelpSolutionSolutionResourcesRestClient.Get(Id, solutionResourceName, cancellationToken);
+                RequestContext context = new RequestContext
+                {
+                    CancellationToken = cancellationToken
+                };
+                HttpMessage message = _solutionResourcesRestClient.CreateGetRequest(Id, solutionResourceName, context);
+                Response result = Pipeline.ProcessMessage(message, context);
+                Response<SelfHelpSolutionData> response = Response.FromValue(SelfHelpSolutionData.FromResponse(result), result);
                 if (response.Value == null)
+                {
                     throw new RequestFailedException(response.GetRawResponse());
+                }
                 return Response.FromValue(new SelfHelpSolutionResource(Client, response.Value), response.GetRawResponse());
             }
             catch (Exception e)
@@ -227,39 +253,53 @@ public virtual Response<SelfHelpSolutionResource> Get(string solutionResourceNam
         }
 
         /// <summary>
-        /// Checks to see if the resource exists in azure.
+        /// Get the solution using the applicable solutionResourceName while creating the solution.
         /// <list type="bullet">
         /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/solutions/{solutionResourceName}</description>
-        /// </item>
-        /// <item>
-        /// <term>Operation Id</term>
-        /// <description>SolutionResource_Get</description>
+        /// <term> Request Path. </term>
+        /// <description> /{scope}/providers/Microsoft.Help/solutions/{solutionResourceName}. </description>
         /// </item>
         /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
+        /// <term> Operation Id. </term>
+        /// <description> SolutionResources_Get. </description>
         /// </item>
         /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpSolutionResource"/></description>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="solutionResourceName"> Solution resource Name. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentException"> <paramref name="solutionResourceName"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="ArgumentNullException"> <paramref name="solutionResourceName"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="solutionResourceName"/> is an empty string, and was expected to be non-empty. </exception>
         public virtual async Task<Response<bool>> ExistsAsync(string solutionResourceName, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(solutionResourceName, nameof(solutionResourceName));
 
-            using var scope = _selfHelpSolutionSolutionResourcesClientDiagnostics.CreateScope("SelfHelpSolutionCollection.Exists");
+            using DiagnosticScope scope = _solutionResourcesClientDiagnostics.CreateScope("SelfHelpSolutionCollection.Exists");
             scope.Start();
             try
             {
-                var response = await _selfHelpSolutionSolutionResourcesRestClient.GetAsync(Id, solutionResourceName, cancellationToken: cancellationToken).ConfigureAwait(false);
+                RequestContext context = new RequestContext
+                {
+                    CancellationToken = cancellationToken
+                };
+                HttpMessage message = _solutionResourcesRestClient.CreateGetRequest(Id, solutionResourceName, context);
+                await Pipeline.SendAsync(message, context.CancellationToken).ConfigureAwait(false);
+                Response result = message.Response;
+                Response<SelfHelpSolutionData> response = default;
+                switch (result.Status)
+                {
+                    case 200:
+                        response = Response.FromValue(SelfHelpSolutionData.FromResponse(result), result);
+                        break;
+                    case 404:
+                        response = Response.FromValue((SelfHelpSolutionData)null, result);
+                        break;
+                    default:
+                        throw new RequestFailedException(result);
+                }
                 return Response.FromValue(response.Value != null, response.GetRawResponse());
             }
             catch (Exception e)
@@ -270,39 +310,53 @@ public virtual async Task<Response<bool>> ExistsAsync(string solutionResourceNam
         }
 
         /// <summary>
-        /// Checks to see if the resource exists in azure.
+        /// Get the solution using the applicable solutionResourceName while creating the solution.
         /// <list type="bullet">
         /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/solutions/{solutionResourceName}</description>
-        /// </item>
-        /// <item>
-        /// <term>Operation Id</term>
-        /// <description>SolutionResource_Get</description>
+        /// <term> Request Path. </term>
+        /// <description> /{scope}/providers/Microsoft.Help/solutions/{solutionResourceName}. </description>
         /// </item>
         /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
+        /// <term> Operation Id. </term>
+        /// <description> SolutionResources_Get. </description>
         /// </item>
         /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpSolutionResource"/></description>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="solutionResourceName"> Solution resource Name. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentException"> <paramref name="solutionResourceName"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="ArgumentNullException"> <paramref name="solutionResourceName"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="solutionResourceName"/> is an empty string, and was expected to be non-empty. </exception>
         public virtual Response<bool> Exists(string solutionResourceName, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(solutionResourceName, nameof(solutionResourceName));
 
-            using var scope = _selfHelpSolutionSolutionResourcesClientDiagnostics.CreateScope("SelfHelpSolutionCollection.Exists");
+            using DiagnosticScope scope = _solutionResourcesClientDiagnostics.CreateScope("SelfHelpSolutionCollection.Exists");
             scope.Start();
             try
             {
-                var response = _selfHelpSolutionSolutionResourcesRestClient.Get(Id, solutionResourceName, cancellationToken: cancellationToken);
+                RequestContext context = new RequestContext
+                {
+                    CancellationToken = cancellationToken
+                };
+                HttpMessage message = _solutionResourcesRestClient.CreateGetRequest(Id, solutionResourceName, context);
+                Pipeline.Send(message, context.CancellationToken);
+                Response result = message.Response;
+                Response<SelfHelpSolutionData> response = default;
+                switch (result.Status)
+                {
+                    case 200:
+                        response = Response.FromValue(SelfHelpSolutionData.FromResponse(result), result);
+                        break;
+                    case 404:
+                        response = Response.FromValue((SelfHelpSolutionData)null, result);
+                        break;
+                    default:
+                        throw new RequestFailedException(result);
+                }
                 return Response.FromValue(response.Value != null, response.GetRawResponse());
             }
             catch (Exception e)
@@ -313,41 +367,57 @@ public virtual Response<bool> Exists(string solutionResourceName, CancellationTo
         }
 
         /// <summary>
-        /// Tries to get details for this resource from the service.
+        /// Get the solution using the applicable solutionResourceName while creating the solution.
         /// <list type="bullet">
         /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/solutions/{solutionResourceName}</description>
+        /// <term> Request Path. </term>
+        /// <description> /{scope}/providers/Microsoft.Help/solutions/{solutionResourceName}. </description>
         /// </item>
         /// <item>
-        /// <term>Operation Id</term>
-        /// <description>SolutionResource_Get</description>
+        /// <term> Operation Id. </term>
+        /// <description> SolutionResources_Get. </description>
         /// </item>
         /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
-        /// </item>
-        /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpSolutionResource"/></description>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="solutionResourceName"> Solution resource Name. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentException"> <paramref name="solutionResourceName"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="ArgumentNullException"> <paramref name="solutionResourceName"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="solutionResourceName"/> is an empty string, and was expected to be non-empty. </exception>
         public virtual async Task<NullableResponse<SelfHelpSolutionResource>> GetIfExistsAsync(string solutionResourceName, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(solutionResourceName, nameof(solutionResourceName));
 
-            using var scope = _selfHelpSolutionSolutionResourcesClientDiagnostics.CreateScope("SelfHelpSolutionCollection.GetIfExists");
+            using DiagnosticScope scope = _solutionResourcesClientDiagnostics.CreateScope("SelfHelpSolutionCollection.GetIfExists");
             scope.Start();
             try
             {
-                var response = await _selfHelpSolutionSolutionResourcesRestClient.GetAsync(Id, solutionResourceName, cancellationToken: cancellationToken).ConfigureAwait(false);
+                RequestContext context = new RequestContext
+                {
+                    CancellationToken = cancellationToken
+                };
+                HttpMessage message = _solutionResourcesRestClient.CreateGetRequest(Id, solutionResourceName, context);
+                await Pipeline.SendAsync(message, context.CancellationToken).ConfigureAwait(false);
+                Response result = message.Response;
+                Response<SelfHelpSolutionData> response = default;
+                switch (result.Status)
+                {
+                    case 200:
+                        response = Response.FromValue(SelfHelpSolutionData.FromResponse(result), result);
+                        break;
+                    case 404:
+                        response = Response.FromValue((SelfHelpSolutionData)null, result);
+                        break;
+                    default:
+                        throw new RequestFailedException(result);
+                }
                 if (response.Value == null)
+                {
                     return new NoValueResponse<SelfHelpSolutionResource>(response.GetRawResponse());
+                }
                 return Response.FromValue(new SelfHelpSolutionResource(Client, response.Value), response.GetRawResponse());
             }
             catch (Exception e)
@@ -358,41 +428,57 @@ public virtual async Task<NullableResponse<SelfHelpSolutionResource>> GetIfExist
         }
 
         /// <summary>
-        /// Tries to get details for this resource from the service.
+        /// Get the solution using the applicable solutionResourceName while creating the solution.
         /// <list type="bullet">
         /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/solutions/{solutionResourceName}</description>
+        /// <term> Request Path. </term>
+        /// <description> /{scope}/providers/Microsoft.Help/solutions/{solutionResourceName}. </description>
         /// </item>
         /// <item>
-        /// <term>Operation Id</term>
-        /// <description>SolutionResource_Get</description>
+        /// <term> Operation Id. </term>
+        /// <description> SolutionResources_Get. </description>
         /// </item>
         /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
-        /// </item>
-        /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpSolutionResource"/></description>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="solutionResourceName"> Solution resource Name. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentException"> <paramref name="solutionResourceName"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="ArgumentNullException"> <paramref name="solutionResourceName"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="solutionResourceName"/> is an empty string, and was expected to be non-empty. </exception>
         public virtual NullableResponse<SelfHelpSolutionResource> GetIfExists(string solutionResourceName, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(solutionResourceName, nameof(solutionResourceName));
 
-            using var scope = _selfHelpSolutionSolutionResourcesClientDiagnostics.CreateScope("SelfHelpSolutionCollection.GetIfExists");
+            using DiagnosticScope scope = _solutionResourcesClientDiagnostics.CreateScope("SelfHelpSolutionCollection.GetIfExists");
             scope.Start();
             try
             {
-                var response = _selfHelpSolutionSolutionResourcesRestClient.Get(Id, solutionResourceName, cancellationToken: cancellationToken);
+                RequestContext context = new RequestContext
+                {
+                    CancellationToken = cancellationToken
+                };
+                HttpMessage message = _solutionResourcesRestClient.CreateGetRequest(Id, solutionResourceName, context);
+                Pipeline.Send(message, context.CancellationToken);
+                Response result = message.Response;
+                Response<SelfHelpSolutionData> response = default;
+                switch (result.Status)
+                {
+                    case 200:
+                        response = Response.FromValue(SelfHelpSolutionData.FromResponse(result), result);
+                        break;
+                    case 404:
+                        response = Response.FromValue((SelfHelpSolutionData)null, result);
+                        break;
+                    default:
+                        throw new RequestFailedException(result);
+                }
                 if (response.Value == null)
+                {
                     return new NoValueResponse<SelfHelpSolutionResource>(response.GetRawResponse());
+                }
                 return Response.FromValue(new SelfHelpSolutionResource(Client, response.Value), response.GetRawResponse());
             }
             catch (Exception e)
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpSolutionData.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpSolutionData.Serialization.cs
index c811d0c1bfa9..498ad3af62cb 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpSolutionData.Serialization.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpSolutionData.Serialization.cs
@@ -10,16 +10,18 @@
 using System.Collections.Generic;
 using System.Text;
 using System.Text.Json;
+using Azure;
 using Azure.Core;
 using Azure.ResourceManager.Models;
 using Azure.ResourceManager.SelfHelp.Models;
 
 namespace Azure.ResourceManager.SelfHelp
 {
-    public partial class SelfHelpSolutionData : IUtf8JsonSerializable, IJsonModel<SelfHelpSolutionData>
+    /// <summary> Solution response. </summary>
+    public partial class SelfHelpSolutionData : ResourceData, IJsonModel<SelfHelpSolutionData>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<SelfHelpSolutionData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
+        /// <param name="writer"> The JSON writer. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
         void IJsonModel<SelfHelpSolutionData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
@@ -31,247 +33,114 @@ void IJsonModel<SelfHelpSolutionData>.Write(Utf8JsonWriter writer, ModelReaderWr
         /// <param name="options"> The client options for reading and writing models. </param>
         protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpSolutionData>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpSolutionData>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(SelfHelpSolutionData)} does not support writing '{format}' format.");
             }
-
             base.JsonModelWriteCore(writer, options);
-            writer.WritePropertyName("properties"u8);
-            writer.WriteStartObject();
-            if (Optional.IsCollectionDefined(TriggerCriteria))
-            {
-                writer.WritePropertyName("triggerCriteria"u8);
-                writer.WriteStartArray();
-                foreach (var item in TriggerCriteria)
-                {
-                    writer.WriteObjectValue(item, options);
-                }
-                writer.WriteEndArray();
-            }
-            if (Optional.IsCollectionDefined(Parameters))
-            {
-                writer.WritePropertyName("parameters"u8);
-                writer.WriteStartObject();
-                foreach (var item in Parameters)
-                {
-                    writer.WritePropertyName(item.Key);
-                    writer.WriteStringValue(item.Value);
-                }
-                writer.WriteEndObject();
-            }
-            if (options.Format != "W" && Optional.IsDefined(SolutionId))
-            {
-                writer.WritePropertyName("solutionId"u8);
-                writer.WriteStringValue(SolutionId);
-            }
-            if (options.Format != "W" && Optional.IsDefined(ProvisioningState))
+            if (Optional.IsDefined(Properties))
             {
-                writer.WritePropertyName("provisioningState"u8);
-                writer.WriteStringValue(ProvisioningState.Value.ToString());
+                writer.WritePropertyName("properties"u8);
+                writer.WriteObjectValue(Properties, options);
             }
-            if (options.Format != "W" && Optional.IsDefined(Title))
-            {
-                writer.WritePropertyName("title"u8);
-                writer.WriteStringValue(Title);
-            }
-            if (options.Format != "W" && Optional.IsDefined(Content))
-            {
-                writer.WritePropertyName("content"u8);
-                writer.WriteStringValue(Content);
-            }
-            if (options.Format != "W" && Optional.IsDefined(ReplacementMaps))
-            {
-                writer.WritePropertyName("replacementMaps"u8);
-                writer.WriteObjectValue(ReplacementMaps, options);
-            }
-            if (options.Format != "W" && Optional.IsCollectionDefined(Sections))
-            {
-                writer.WritePropertyName("sections"u8);
-                writer.WriteStartArray();
-                foreach (var item in Sections)
-                {
-                    writer.WriteObjectValue(item, options);
-                }
-                writer.WriteEndArray();
-            }
-            writer.WriteEndObject();
         }
 
-        SelfHelpSolutionData IJsonModel<SelfHelpSolutionData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        SelfHelpSolutionData IJsonModel<SelfHelpSolutionData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => (SelfHelpSolutionData)JsonModelCreateCore(ref reader, options);
+
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual ResourceData JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpSolutionData>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpSolutionData>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(SelfHelpSolutionData)} does not support reading '{format}' format.");
             }
-
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
             return DeserializeSelfHelpSolutionData(document.RootElement, options);
         }
 
-        internal static SelfHelpSolutionData DeserializeSelfHelpSolutionData(JsonElement element, ModelReaderWriterOptions options = null)
+        /// <param name="element"> The JSON element to deserialize. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        internal static SelfHelpSolutionData DeserializeSelfHelpSolutionData(JsonElement element, ModelReaderWriterOptions options)
         {
-            options ??= ModelSerializationExtensions.WireOptions;
-
             if (element.ValueKind == JsonValueKind.Null)
             {
                 return null;
             }
             ResourceIdentifier id = default;
             string name = default;
-            ResourceType type = default;
+            ResourceType resourceType = default;
             SystemData systemData = default;
-            IList<SolutionTriggerCriterion> triggerCriteria = default;
-            IDictionary<string, string> parameters = default;
-            string solutionId = default;
-            SolutionProvisioningState? provisioningState = default;
-            string title = default;
-            string content = default;
-            SolutionReplacementMaps replacementMaps = default;
-            IReadOnlyList<SelfHelpSection> sections = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
+            IDictionary<string, BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            SolutionResourceProperties properties = default;
+            foreach (var prop in element.EnumerateObject())
             {
-                if (property.NameEquals("id"u8))
+                if (prop.NameEquals("id"u8))
                 {
-                    id = new ResourceIdentifier(property.Value.GetString());
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    id = new ResourceIdentifier(prop.Value.GetString());
                     continue;
                 }
-                if (property.NameEquals("name"u8))
+                if (prop.NameEquals("name"u8))
                 {
-                    name = property.Value.GetString();
+                    name = prop.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("type"u8))
+                if (prop.NameEquals("type"u8))
                 {
-                    type = new ResourceType(property.Value.GetString());
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    resourceType = new ResourceType(prop.Value.GetString());
                     continue;
                 }
-                if (property.NameEquals("systemData"u8))
+                if (prop.NameEquals("systemData"u8))
                 {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
-                    systemData = ModelReaderWriter.Read<SystemData>(new BinaryData(Encoding.UTF8.GetBytes(property.Value.GetRawText())), ModelSerializationExtensions.WireOptions, AzureResourceManagerSelfHelpContext.Default);
+                    systemData = ModelReaderWriter.Read<SystemData>(new BinaryData(Encoding.UTF8.GetBytes(prop.Value.GetRawText())), ModelSerializationExtensions.WireOptions, AzureResourceManagerSelfHelpContext.Default);
                     continue;
                 }
-                if (property.NameEquals("properties"u8))
+                if (prop.NameEquals("properties"u8))
                 {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
-                        property.ThrowNonNullablePropertyIsNull();
                         continue;
                     }
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        if (property0.NameEquals("triggerCriteria"u8))
-                        {
-                            if (property0.Value.ValueKind == JsonValueKind.Null)
-                            {
-                                continue;
-                            }
-                            List<SolutionTriggerCriterion> array = new List<SolutionTriggerCriterion>();
-                            foreach (var item in property0.Value.EnumerateArray())
-                            {
-                                array.Add(SolutionTriggerCriterion.DeserializeSolutionTriggerCriterion(item, options));
-                            }
-                            triggerCriteria = array;
-                            continue;
-                        }
-                        if (property0.NameEquals("parameters"u8))
-                        {
-                            if (property0.Value.ValueKind == JsonValueKind.Null)
-                            {
-                                continue;
-                            }
-                            Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                            foreach (var property1 in property0.Value.EnumerateObject())
-                            {
-                                dictionary.Add(property1.Name, property1.Value.GetString());
-                            }
-                            parameters = dictionary;
-                            continue;
-                        }
-                        if (property0.NameEquals("solutionId"u8))
-                        {
-                            solutionId = property0.Value.GetString();
-                            continue;
-                        }
-                        if (property0.NameEquals("provisioningState"u8))
-                        {
-                            if (property0.Value.ValueKind == JsonValueKind.Null)
-                            {
-                                continue;
-                            }
-                            provisioningState = new SolutionProvisioningState(property0.Value.GetString());
-                            continue;
-                        }
-                        if (property0.NameEquals("title"u8))
-                        {
-                            title = property0.Value.GetString();
-                            continue;
-                        }
-                        if (property0.NameEquals("content"u8))
-                        {
-                            content = property0.Value.GetString();
-                            continue;
-                        }
-                        if (property0.NameEquals("replacementMaps"u8))
-                        {
-                            if (property0.Value.ValueKind == JsonValueKind.Null)
-                            {
-                                continue;
-                            }
-                            replacementMaps = SolutionReplacementMaps.DeserializeSolutionReplacementMaps(property0.Value, options);
-                            continue;
-                        }
-                        if (property0.NameEquals("sections"u8))
-                        {
-                            if (property0.Value.ValueKind == JsonValueKind.Null)
-                            {
-                                continue;
-                            }
-                            List<SelfHelpSection> array = new List<SelfHelpSection>();
-                            foreach (var item in property0.Value.EnumerateArray())
-                            {
-                                array.Add(SelfHelpSection.DeserializeSelfHelpSection(item, options));
-                            }
-                            sections = array;
-                            continue;
-                        }
-                    }
+                    properties = SolutionResourceProperties.DeserializeSolutionResourceProperties(prop.Value, options);
                     continue;
                 }
                 if (options.Format != "W")
                 {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                    additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText()));
                 }
             }
-            serializedAdditionalRawData = rawDataDictionary;
             return new SelfHelpSolutionData(
                 id,
                 name,
-                type,
+                resourceType,
                 systemData,
-                triggerCriteria ?? new ChangeTrackingList<SolutionTriggerCriterion>(),
-                parameters ?? new ChangeTrackingDictionary<string, string>(),
-                solutionId,
-                provisioningState,
-                title,
-                content,
-                replacementMaps,
-                sections ?? new ChangeTrackingList<SelfHelpSection>(),
-                serializedAdditionalRawData);
+                additionalBinaryDataProperties,
+                properties);
         }
 
-        BinaryData IPersistableModel<SelfHelpSolutionData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpSolutionData>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="options"> The client options for reading and writing models. </param>
+        BinaryData IPersistableModel<SelfHelpSolutionData>.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
 
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpSolutionData>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
@@ -281,15 +150,20 @@ BinaryData IPersistableModel<SelfHelpSolutionData>.Write(ModelReaderWriterOption
             }
         }
 
-        SelfHelpSolutionData IPersistableModel<SelfHelpSolutionData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpSolutionData>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        SelfHelpSolutionData IPersistableModel<SelfHelpSolutionData>.Create(BinaryData data, ModelReaderWriterOptions options) => (SelfHelpSolutionData)PersistableModelCreateCore(data, options);
 
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual ResourceData PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpSolutionData>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
+                    using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
                     {
-                        using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
                         return DeserializeSelfHelpSolutionData(document.RootElement, options);
                     }
                 default:
@@ -297,6 +171,26 @@ SelfHelpSolutionData IPersistableModel<SelfHelpSolutionData>.Create(BinaryData d
             }
         }
 
+        /// <param name="options"> The client options for reading and writing models. </param>
         string IPersistableModel<SelfHelpSolutionData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <param name="selfHelpSolutionData"> The <see cref="SelfHelpSolutionData"/> to serialize into <see cref="RequestContent"/>. </param>
+        internal static RequestContent ToRequestContent(SelfHelpSolutionData selfHelpSolutionData)
+        {
+            if (selfHelpSolutionData == null)
+            {
+                return null;
+            }
+            Utf8JsonRequestContent content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(selfHelpSolutionData, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+
+        /// <param name="response"> The <see cref="Response"/> to deserialize the <see cref="SelfHelpSolutionData"/> from. </param>
+        internal static SelfHelpSolutionData FromResponse(Response response)
+        {
+            using JsonDocument document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions);
+            return DeserializeSelfHelpSolutionData(document.RootElement, ModelSerializationExtensions.WireOptions);
+        }
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpSolutionData.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpSolutionData.cs
index 9ce085980809..6b61f93867ab 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpSolutionData.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpSolutionData.cs
@@ -13,94 +13,115 @@
 
 namespace Azure.ResourceManager.SelfHelp
 {
-    /// <summary>
-    /// A class representing the SelfHelpSolution data model.
-    /// Solution response.
-    /// </summary>
+    /// <summary> Solution response. </summary>
     public partial class SelfHelpSolutionData : ResourceData
     {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+        /// <summary> Keeps track of any properties unknown to the library. </summary>
+        private protected readonly IDictionary<string, BinaryData> _additionalBinaryDataProperties;
 
         /// <summary> Initializes a new instance of <see cref="SelfHelpSolutionData"/>. </summary>
         public SelfHelpSolutionData()
         {
-            TriggerCriteria = new ChangeTrackingList<SolutionTriggerCriterion>();
-            Parameters = new ChangeTrackingDictionary<string, string>();
-            Sections = new ChangeTrackingList<SelfHelpSection>();
         }
 
         /// <summary> Initializes a new instance of <see cref="SelfHelpSolutionData"/>. </summary>
-        /// <param name="id"> The id. </param>
-        /// <param name="name"> The name. </param>
-        /// <param name="resourceType"> The resourceType. </param>
-        /// <param name="systemData"> The systemData. </param>
-        /// <param name="triggerCriteria"> Solution request trigger criteria. </param>
-        /// <param name="parameters"> Client input parameters to run Solution. </param>
-        /// <param name="solutionId"> Solution Id to identify single solution. </param>
-        /// <param name="provisioningState"> Status of solution provisioning. </param>
-        /// <param name="title"> The title. </param>
-        /// <param name="content"> The HTML content that needs to be rendered and shown to customer. </param>
-        /// <param name="replacementMaps"> Solution replacement maps. </param>
-        /// <param name="sections"> List of section object. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal SelfHelpSolutionData(ResourceIdentifier id, string name, ResourceType resourceType, SystemData systemData, IList<SolutionTriggerCriterion> triggerCriteria, IDictionary<string, string> parameters, string solutionId, SolutionProvisioningState? provisioningState, string title, string content, SolutionReplacementMaps replacementMaps, IReadOnlyList<SelfHelpSection> sections, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(id, name, resourceType, systemData)
+        /// <param name="id"> Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. </param>
+        /// <param name="name"> The name of the resource. </param>
+        /// <param name="resourceType"> The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts". </param>
+        /// <param name="systemData"> Azure Resource Manager metadata containing createdBy and modifiedBy information. </param>
+        /// <param name="additionalBinaryDataProperties"> Keeps track of any properties unknown to the library. </param>
+        /// <param name="properties"> Solution result. </param>
+        internal SelfHelpSolutionData(ResourceIdentifier id, string name, ResourceType resourceType, SystemData systemData, IDictionary<string, BinaryData> additionalBinaryDataProperties, SolutionResourceProperties properties) : base(id, name, resourceType, systemData)
         {
-            TriggerCriteria = triggerCriteria;
-            Parameters = parameters;
-            SolutionId = solutionId;
-            ProvisioningState = provisioningState;
-            Title = title;
-            Content = content;
-            ReplacementMaps = replacementMaps;
-            Sections = sections;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
+            _additionalBinaryDataProperties = additionalBinaryDataProperties;
+            Properties = properties;
         }
 
+        /// <summary> Solution result. </summary>
+        internal SolutionResourceProperties Properties { get; set; }
+
         /// <summary> Solution request trigger criteria. </summary>
-        public IList<SolutionTriggerCriterion> TriggerCriteria { get; }
+        public IList<SolutionTriggerCriterion> TriggerCriteria
+        {
+            get
+            {
+                if (Properties is null)
+                {
+                    Properties = new SolutionResourceProperties();
+                }
+                return Properties.TriggerCriteria;
+            }
+        }
+
         /// <summary> Client input parameters to run Solution. </summary>
-        public IDictionary<string, string> Parameters { get; }
+        public IDictionary<string, string> Parameters
+        {
+            get
+            {
+                if (Properties is null)
+                {
+                    Properties = new SolutionResourceProperties();
+                }
+                return Properties.Parameters;
+            }
+        }
+
         /// <summary> Solution Id to identify single solution. </summary>
-        public string SolutionId { get; }
+        public string SolutionId
+        {
+            get
+            {
+                return Properties is null ? default : Properties.SolutionId;
+            }
+        }
+
         /// <summary> Status of solution provisioning. </summary>
-        public SolutionProvisioningState? ProvisioningState { get; }
+        public SolutionProvisioningState? ProvisioningState
+        {
+            get
+            {
+                return Properties is null ? default : Properties.ProvisioningState;
+            }
+        }
+
         /// <summary> The title. </summary>
-        public string Title { get; }
+        public string Title
+        {
+            get
+            {
+                return Properties is null ? default : Properties.Title;
+            }
+        }
+
         /// <summary> The HTML content that needs to be rendered and shown to customer. </summary>
-        public string Content { get; }
+        public string Content
+        {
+            get
+            {
+                return Properties is null ? default : Properties.Content;
+            }
+        }
+
         /// <summary> Solution replacement maps. </summary>
-        public SolutionReplacementMaps ReplacementMaps { get; }
+        public SolutionReplacementMaps ReplacementMaps
+        {
+            get
+            {
+                return Properties is null ? default : Properties.ReplacementMaps;
+            }
+        }
+
         /// <summary> List of section object. </summary>
-        public IReadOnlyList<SelfHelpSection> Sections { get; }
+        public IReadOnlyList<SelfHelpSection> Sections
+        {
+            get
+            {
+                if (Properties is null)
+                {
+                    Properties = new SolutionResourceProperties();
+                }
+                return Properties.Sections;
+            }
+        }
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpSolutionResource.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpSolutionResource.Serialization.cs
index 12e75212e068..530f4a52e194 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpSolutionResource.Serialization.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpSolutionResource.Serialization.cs
@@ -11,19 +11,29 @@
 
 namespace Azure.ResourceManager.SelfHelp
 {
+    /// <summary></summary>
     public partial class SelfHelpSolutionResource : IJsonModel<SelfHelpSolutionData>
     {
-        private static SelfHelpSolutionData s_dataDeserializationInstance;
-        private static SelfHelpSolutionData DataDeserializationInstance => s_dataDeserializationInstance ??= new();
+        private static IJsonModel<SelfHelpSolutionData> s_dataDeserializationInstance;
 
+        private static IJsonModel<SelfHelpSolutionData> DataDeserializationInstance => s_dataDeserializationInstance ??= new SelfHelpSolutionData();
+
+        /// <param name="writer"> The writer to serialize the model to. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
         void IJsonModel<SelfHelpSolutionData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => ((IJsonModel<SelfHelpSolutionData>)Data).Write(writer, options);
 
-        SelfHelpSolutionData IJsonModel<SelfHelpSolutionData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => ((IJsonModel<SelfHelpSolutionData>)DataDeserializationInstance).Create(ref reader, options);
+        /// <param name="reader"> The reader for deserializing the model. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        SelfHelpSolutionData IJsonModel<SelfHelpSolutionData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => DataDeserializationInstance.Create(ref reader, options);
 
+        /// <param name="options"> The client options for reading and writing models. </param>
         BinaryData IPersistableModel<SelfHelpSolutionData>.Write(ModelReaderWriterOptions options) => ModelReaderWriter.Write<SelfHelpSolutionData>(Data, options, AzureResourceManagerSelfHelpContext.Default);
 
+        /// <param name="data"> The binary data to be processed. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
         SelfHelpSolutionData IPersistableModel<SelfHelpSolutionData>.Create(BinaryData data, ModelReaderWriterOptions options) => ModelReaderWriter.Read<SelfHelpSolutionData>(data, options, AzureResourceManagerSelfHelpContext.Default);
 
-        string IPersistableModel<SelfHelpSolutionData>.GetFormatFromOptions(ModelReaderWriterOptions options) => ((IPersistableModel<SelfHelpSolutionData>)DataDeserializationInstance).GetFormatFromOptions(options);
+        /// <param name="options"> The client options for reading and writing models. </param>
+        string IPersistableModel<SelfHelpSolutionData>.GetFormatFromOptions(ModelReaderWriterOptions options) => DataDeserializationInstance.GetFormatFromOptions(options);
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpSolutionResource.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpSolutionResource.cs
index 9890a3de28ea..1607e57130fb 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpSolutionResource.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpSolutionResource.cs
@@ -6,45 +6,36 @@
 #nullable disable
 
 using System;
-using System.Globalization;
+using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
+using Azure;
 using Azure.Core;
 using Azure.Core.Pipeline;
+using Azure.ResourceManager;
 using Azure.ResourceManager.SelfHelp.Models;
 
 namespace Azure.ResourceManager.SelfHelp
 {
     /// <summary>
-    /// A Class representing a SelfHelpSolution along with the instance operations that can be performed on it.
-    /// If you have a <see cref="ResourceIdentifier"/> you can construct a <see cref="SelfHelpSolutionResource"/>
-    /// from an instance of <see cref="ArmClient"/> using the GetSelfHelpSolutionResource method.
-    /// Otherwise you can get one from its parent resource <see cref="ArmResource"/> using the GetSelfHelpSolution method.
+    /// A class representing a SelfHelpSolution along with the instance operations that can be performed on it.
+    /// If you have a <see cref="ResourceIdentifier"/> you can construct a <see cref="SelfHelpSolutionResource"/> from an instance of <see cref="ArmClient"/> using the GetResource method.
+    /// Otherwise you can get one from its parent resource <see cref="ArmResource"/> using the GetSelfHelpSolutions method.
     /// </summary>
     public partial class SelfHelpSolutionResource : ArmResource
     {
-        /// <summary> Generate the resource identifier of a <see cref="SelfHelpSolutionResource"/> instance. </summary>
-        /// <param name="scope"> The scope. </param>
-        /// <param name="solutionResourceName"> The solutionResourceName. </param>
-        public static ResourceIdentifier CreateResourceIdentifier(string scope, string solutionResourceName)
-        {
-            var resourceId = $"{scope}/providers/Microsoft.Help/solutions/{solutionResourceName}";
-            return new ResourceIdentifier(resourceId);
-        }
-
-        private readonly ClientDiagnostics _selfHelpSolutionSolutionResourcesClientDiagnostics;
-        private readonly SolutionResourcesRestOperations _selfHelpSolutionSolutionResourcesRestClient;
+        private readonly ClientDiagnostics _solutionResourcesClientDiagnostics;
+        private readonly SolutionResources _solutionResourcesRestClient;
         private readonly SelfHelpSolutionData _data;
-
         /// <summary> Gets the resource type for the operations. </summary>
         public static readonly ResourceType ResourceType = "Microsoft.Help/solutions";
 
-        /// <summary> Initializes a new instance of the <see cref="SelfHelpSolutionResource"/> class for mocking. </summary>
+        /// <summary> Initializes a new instance of SelfHelpSolutionResource for mocking. </summary>
         protected SelfHelpSolutionResource()
         {
         }
 
-        /// <summary> Initializes a new instance of the <see cref="SelfHelpSolutionResource"/> class. </summary>
+        /// <summary> Initializes a new instance of <see cref="SelfHelpSolutionResource"/> class. </summary>
         /// <param name="client"> The client parameters to use in these operations. </param>
         /// <param name="data"> The resource that is the target of operations. </param>
         internal SelfHelpSolutionResource(ArmClient client, SelfHelpSolutionData data) : this(client, data.Id)
@@ -53,71 +44,91 @@ internal SelfHelpSolutionResource(ArmClient client, SelfHelpSolutionData data) :
             _data = data;
         }
 
-        /// <summary> Initializes a new instance of the <see cref="SelfHelpSolutionResource"/> class. </summary>
+        /// <summary> Initializes a new instance of <see cref="SelfHelpSolutionResource"/> class. </summary>
         /// <param name="client"> The client parameters to use in these operations. </param>
         /// <param name="id"> The identifier of the resource that is the target of operations. </param>
         internal SelfHelpSolutionResource(ArmClient client, ResourceIdentifier id) : base(client, id)
         {
-            _selfHelpSolutionSolutionResourcesClientDiagnostics = new ClientDiagnostics("Azure.ResourceManager.SelfHelp", ResourceType.Namespace, Diagnostics);
-            TryGetApiVersion(ResourceType, out string selfHelpSolutionSolutionResourcesApiVersion);
-            _selfHelpSolutionSolutionResourcesRestClient = new SolutionResourcesRestOperations(Pipeline, Diagnostics.ApplicationId, Endpoint, selfHelpSolutionSolutionResourcesApiVersion);
-#if DEBUG
-			ValidateResourceId(Id);
-#endif
+            TryGetApiVersion(ResourceType, out string selfHelpSolutionApiVersion);
+            _solutionResourcesClientDiagnostics = new ClientDiagnostics("Azure.ResourceManager.SelfHelp", ResourceType.Namespace, Diagnostics);
+            _solutionResourcesRestClient = new SolutionResources(_solutionResourcesClientDiagnostics, Pipeline, Endpoint, selfHelpSolutionApiVersion ?? "2024-03-01-preview");
+            ValidateResourceId(id);
         }
 
         /// <summary> Gets whether or not the current instance has data. </summary>
         public virtual bool HasData { get; }
 
         /// <summary> Gets the data representing this Feature. </summary>
-        /// <exception cref="InvalidOperationException"> Throws if there is no data loaded in the current instance. </exception>
         public virtual SelfHelpSolutionData Data
         {
             get
             {
                 if (!HasData)
+                {
                     throw new InvalidOperationException("The current instance does not have data, you must call Get first.");
+                }
                 return _data;
             }
         }
 
+        /// <summary> Generate the resource identifier for this resource. </summary>
+        /// <param name="scope"> The scope. </param>
+        /// <param name="solutionResourceName"> The solutionResourceName. </param>
+        public static ResourceIdentifier CreateResourceIdentifier(string scope, string solutionResourceName)
+        {
+            string resourceId = $"{scope}/providers/Microsoft.Help/solutions/{solutionResourceName}";
+            return new ResourceIdentifier(resourceId);
+        }
+
+        /// <param name="id"></param>
+        [Conditional("DEBUG")]
         internal static void ValidateResourceId(ResourceIdentifier id)
         {
             if (id.ResourceType != ResourceType)
-                throw new ArgumentException(string.Format(CultureInfo.CurrentCulture, "Invalid resource type {0} expected {1}", id.ResourceType, ResourceType), nameof(id));
+            {
+                throw new ArgumentException(string.Format("Invalid resource type {0} expected {1}", id.ResourceType, ResourceType), id);
+            }
         }
 
         /// <summary>
         /// Get the solution using the applicable solutionResourceName while creating the solution.
         /// <list type="bullet">
         /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/solutions/{solutionResourceName}</description>
+        /// <term> Request Path. </term>
+        /// <description> /{scope}/providers/Microsoft.Help/solutions/{solutionResourceName}. </description>
         /// </item>
         /// <item>
-        /// <term>Operation Id</term>
-        /// <description>SolutionResource_Get</description>
+        /// <term> Operation Id. </term>
+        /// <description> SolutionResources_Get. </description>
         /// </item>
         /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
         /// </item>
         /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpSolutionResource"/></description>
+        /// <term> Resource. </term>
+        /// <description> <see cref="SelfHelpSolutionResource"/>. </description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<SelfHelpSolutionResource>> GetAsync(CancellationToken cancellationToken = default)
         {
-            using var scope = _selfHelpSolutionSolutionResourcesClientDiagnostics.CreateScope("SelfHelpSolutionResource.Get");
+            using DiagnosticScope scope = _solutionResourcesClientDiagnostics.CreateScope("SelfHelpSolutionResource.Get");
             scope.Start();
             try
             {
-                var response = await _selfHelpSolutionSolutionResourcesRestClient.GetAsync(Id.Parent, Id.Name, cancellationToken).ConfigureAwait(false);
+                RequestContext context = new RequestContext
+                {
+                    CancellationToken = cancellationToken
+                };
+                HttpMessage message = _solutionResourcesRestClient.CreateGetRequest(Id.Parent, Id.Name, context);
+                Response result = await Pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
+                Response<SelfHelpSolutionData> response = Response.FromValue(SelfHelpSolutionData.FromResponse(result), result);
                 if (response.Value == null)
+                {
                     throw new RequestFailedException(response.GetRawResponse());
+                }
                 return Response.FromValue(new SelfHelpSolutionResource(Client, response.Value), response.GetRawResponse());
             }
             catch (Exception e)
@@ -131,33 +142,41 @@ public virtual async Task<Response<SelfHelpSolutionResource>> GetAsync(Cancellat
         /// Get the solution using the applicable solutionResourceName while creating the solution.
         /// <list type="bullet">
         /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/solutions/{solutionResourceName}</description>
+        /// <term> Request Path. </term>
+        /// <description> /{scope}/providers/Microsoft.Help/solutions/{solutionResourceName}. </description>
         /// </item>
         /// <item>
-        /// <term>Operation Id</term>
-        /// <description>SolutionResource_Get</description>
+        /// <term> Operation Id. </term>
+        /// <description> SolutionResources_Get. </description>
         /// </item>
         /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
         /// </item>
         /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpSolutionResource"/></description>
+        /// <term> Resource. </term>
+        /// <description> <see cref="SelfHelpSolutionResource"/>. </description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<SelfHelpSolutionResource> Get(CancellationToken cancellationToken = default)
         {
-            using var scope = _selfHelpSolutionSolutionResourcesClientDiagnostics.CreateScope("SelfHelpSolutionResource.Get");
+            using DiagnosticScope scope = _solutionResourcesClientDiagnostics.CreateScope("SelfHelpSolutionResource.Get");
             scope.Start();
             try
             {
-                var response = _selfHelpSolutionSolutionResourcesRestClient.Get(Id.Parent, Id.Name, cancellationToken);
+                RequestContext context = new RequestContext
+                {
+                    CancellationToken = cancellationToken
+                };
+                HttpMessage message = _solutionResourcesRestClient.CreateGetRequest(Id.Parent, Id.Name, context);
+                Response result = Pipeline.ProcessMessage(message, context);
+                Response<SelfHelpSolutionData> response = Response.FromValue(SelfHelpSolutionData.FromResponse(result), result);
                 if (response.Value == null)
+                {
                     throw new RequestFailedException(response.GetRawResponse());
+                }
                 return Response.FromValue(new SelfHelpSolutionResource(Client, response.Value), response.GetRawResponse());
             }
             catch (Exception e)
@@ -171,39 +190,49 @@ public virtual Response<SelfHelpSolutionResource> Get(CancellationToken cancella
         /// Update the requiredInputs or additional information needed to execute the solution
         /// <list type="bullet">
         /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/solutions/{solutionResourceName}</description>
+        /// <term> Request Path. </term>
+        /// <description> /{scope}/providers/Microsoft.Help/solutions/{solutionResourceName}. </description>
         /// </item>
         /// <item>
-        /// <term>Operation Id</term>
-        /// <description>SolutionResource_Update</description>
+        /// <term> Operation Id. </term>
+        /// <description> SolutionResources_Update. </description>
         /// </item>
         /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
         /// </item>
         /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpSolutionResource"/></description>
+        /// <term> Resource. </term>
+        /// <description> <see cref="SelfHelpSolutionResource"/>. </description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="waitUntil"> <see cref="WaitUntil.Completed"/> if the method should wait to return until the long-running operation has completed on the service; <see cref="WaitUntil.Started"/> if it should return after starting the operation. For more information on long-running operations, please see <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/LongRunningOperations.md"> Azure.Core Long-Running Operation samples</see>. </param>
-        /// <param name="patch"> The required request body for updating a solution resource. </param>
+        /// <param name="solutionPatchRequestBody"> The required request body for updating a solution resource. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="patch"/> is null. </exception>
-        public virtual async Task<ArmOperation<SelfHelpSolutionResource>> UpdateAsync(WaitUntil waitUntil, SelfHelpSolutionPatch patch, CancellationToken cancellationToken = default)
+        public virtual async Task<ArmOperation<SelfHelpSolutionResource>> UpdateAsync(WaitUntil waitUntil, SelfHelpSolutionPatch solutionPatchRequestBody = default, CancellationToken cancellationToken = default)
         {
-            Argument.AssertNotNull(patch, nameof(patch));
-
-            using var scope = _selfHelpSolutionSolutionResourcesClientDiagnostics.CreateScope("SelfHelpSolutionResource.Update");
+            using DiagnosticScope scope = _solutionResourcesClientDiagnostics.CreateScope("SelfHelpSolutionResource.Update");
             scope.Start();
             try
             {
-                var response = await _selfHelpSolutionSolutionResourcesRestClient.UpdateAsync(Id.Parent, Id.Name, patch, cancellationToken).ConfigureAwait(false);
-                var operation = new SelfHelpArmOperation<SelfHelpSolutionResource>(new SelfHelpSolutionOperationSource(Client), _selfHelpSolutionSolutionResourcesClientDiagnostics, Pipeline, _selfHelpSolutionSolutionResourcesRestClient.CreateUpdateRequest(Id.Parent, Id.Name, patch).Request, response, OperationFinalStateVia.AzureAsyncOperation);
+                RequestContext context = new RequestContext
+                {
+                    CancellationToken = cancellationToken
+                };
+                HttpMessage message = _solutionResourcesRestClient.CreateUpdateRequest(Id.Parent, Id.Name, SelfHelpSolutionPatch.ToRequestContent(solutionPatchRequestBody), context);
+                Response response = await Pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
+                SelfHelpArmOperation<SelfHelpSolutionResource> operation = new SelfHelpArmOperation<SelfHelpSolutionResource>(
+                    new SelfHelpSolutionOperationSource(Client),
+                    _solutionResourcesClientDiagnostics,
+                    Pipeline,
+                    message.Request,
+                    response,
+                    OperationFinalStateVia.AzureAsyncOperation);
                 if (waitUntil == WaitUntil.Completed)
+                {
                     await operation.WaitForCompletionAsync(cancellationToken).ConfigureAwait(false);
+                }
                 return operation;
             }
             catch (Exception e)
@@ -217,39 +246,49 @@ public virtual async Task<ArmOperation<SelfHelpSolutionResource>> UpdateAsync(Wa
         /// Update the requiredInputs or additional information needed to execute the solution
         /// <list type="bullet">
         /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/solutions/{solutionResourceName}</description>
+        /// <term> Request Path. </term>
+        /// <description> /{scope}/providers/Microsoft.Help/solutions/{solutionResourceName}. </description>
         /// </item>
         /// <item>
-        /// <term>Operation Id</term>
-        /// <description>SolutionResource_Update</description>
+        /// <term> Operation Id. </term>
+        /// <description> SolutionResources_Update. </description>
         /// </item>
         /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
         /// </item>
         /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpSolutionResource"/></description>
+        /// <term> Resource. </term>
+        /// <description> <see cref="SelfHelpSolutionResource"/>. </description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="waitUntil"> <see cref="WaitUntil.Completed"/> if the method should wait to return until the long-running operation has completed on the service; <see cref="WaitUntil.Started"/> if it should return after starting the operation. For more information on long-running operations, please see <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/LongRunningOperations.md"> Azure.Core Long-Running Operation samples</see>. </param>
-        /// <param name="patch"> The required request body for updating a solution resource. </param>
+        /// <param name="solutionPatchRequestBody"> The required request body for updating a solution resource. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="patch"/> is null. </exception>
-        public virtual ArmOperation<SelfHelpSolutionResource> Update(WaitUntil waitUntil, SelfHelpSolutionPatch patch, CancellationToken cancellationToken = default)
+        public virtual ArmOperation<SelfHelpSolutionResource> Update(WaitUntil waitUntil, SelfHelpSolutionPatch solutionPatchRequestBody = default, CancellationToken cancellationToken = default)
         {
-            Argument.AssertNotNull(patch, nameof(patch));
-
-            using var scope = _selfHelpSolutionSolutionResourcesClientDiagnostics.CreateScope("SelfHelpSolutionResource.Update");
+            using DiagnosticScope scope = _solutionResourcesClientDiagnostics.CreateScope("SelfHelpSolutionResource.Update");
             scope.Start();
             try
             {
-                var response = _selfHelpSolutionSolutionResourcesRestClient.Update(Id.Parent, Id.Name, patch, cancellationToken);
-                var operation = new SelfHelpArmOperation<SelfHelpSolutionResource>(new SelfHelpSolutionOperationSource(Client), _selfHelpSolutionSolutionResourcesClientDiagnostics, Pipeline, _selfHelpSolutionSolutionResourcesRestClient.CreateUpdateRequest(Id.Parent, Id.Name, patch).Request, response, OperationFinalStateVia.AzureAsyncOperation);
+                RequestContext context = new RequestContext
+                {
+                    CancellationToken = cancellationToken
+                };
+                HttpMessage message = _solutionResourcesRestClient.CreateUpdateRequest(Id.Parent, Id.Name, SelfHelpSolutionPatch.ToRequestContent(solutionPatchRequestBody), context);
+                Response response = Pipeline.ProcessMessage(message, context);
+                SelfHelpArmOperation<SelfHelpSolutionResource> operation = new SelfHelpArmOperation<SelfHelpSolutionResource>(
+                    new SelfHelpSolutionOperationSource(Client),
+                    _solutionResourcesClientDiagnostics,
+                    Pipeline,
+                    message.Request,
+                    response,
+                    OperationFinalStateVia.AzureAsyncOperation);
                 if (waitUntil == WaitUntil.Completed)
+                {
                     operation.WaitForCompletion(cancellationToken);
+                }
                 return operation;
             }
             catch (Exception e)
@@ -263,32 +302,37 @@ public virtual ArmOperation<SelfHelpSolutionResource> Update(WaitUntil waitUntil
         /// Warm up the solution resource by preloading asynchronous diagnostics results into cache
         /// <list type="bullet">
         /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/solutions/{solutionResourceName}/warmup</description>
+        /// <term> Request Path. </term>
+        /// <description> /{scope}/providers/Microsoft.Help/solutions/{solutionResourceName}/warmup. </description>
         /// </item>
         /// <item>
-        /// <term>Operation Id</term>
-        /// <description>SolutionResources_WarmUp</description>
+        /// <term> Operation Id. </term>
+        /// <description> SolutionResources_WarmUp. </description>
         /// </item>
         /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
         /// </item>
         /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpSolutionResource"/></description>
+        /// <term> Resource. </term>
+        /// <description> <see cref="SelfHelpSolutionResource"/>. </description>
         /// </item>
         /// </list>
         /// </summary>
-        /// <param name="content"> The required request body for warming up a solution resource. </param>
+        /// <param name="solutionWarmUpRequestBody"> The required request body for warming up a solution resource. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        public virtual async Task<Response> WarmUpAsync(SolutionWarmUpContent content = null, CancellationToken cancellationToken = default)
+        public virtual async Task<Response> WarmUpAsync(SolutionWarmUpContent solutionWarmUpRequestBody = default, CancellationToken cancellationToken = default)
         {
-            using var scope = _selfHelpSolutionSolutionResourcesClientDiagnostics.CreateScope("SelfHelpSolutionResource.WarmUp");
+            using DiagnosticScope scope = _solutionResourcesClientDiagnostics.CreateScope("SelfHelpSolutionResource.WarmUp");
             scope.Start();
             try
             {
-                var response = await _selfHelpSolutionSolutionResourcesRestClient.WarmUpAsync(Id.Parent, Id.Name, content, cancellationToken).ConfigureAwait(false);
+                RequestContext context = new RequestContext
+                {
+                    CancellationToken = cancellationToken
+                };
+                HttpMessage message = _solutionResourcesRestClient.CreateWarmUpRequest(Id.Parent, Id.Name, SolutionWarmUpContent.ToRequestContent(solutionWarmUpRequestBody), context);
+                Response response = await Pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
                 return response;
             }
             catch (Exception e)
@@ -302,32 +346,37 @@ public virtual async Task<Response> WarmUpAsync(SolutionWarmUpContent content =
         /// Warm up the solution resource by preloading asynchronous diagnostics results into cache
         /// <list type="bullet">
         /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/solutions/{solutionResourceName}/warmup</description>
+        /// <term> Request Path. </term>
+        /// <description> /{scope}/providers/Microsoft.Help/solutions/{solutionResourceName}/warmup. </description>
         /// </item>
         /// <item>
-        /// <term>Operation Id</term>
-        /// <description>SolutionResources_WarmUp</description>
+        /// <term> Operation Id. </term>
+        /// <description> SolutionResources_WarmUp. </description>
         /// </item>
         /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
         /// </item>
         /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpSolutionResource"/></description>
+        /// <term> Resource. </term>
+        /// <description> <see cref="SelfHelpSolutionResource"/>. </description>
         /// </item>
         /// </list>
         /// </summary>
-        /// <param name="content"> The required request body for warming up a solution resource. </param>
+        /// <param name="solutionWarmUpRequestBody"> The required request body for warming up a solution resource. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        public virtual Response WarmUp(SolutionWarmUpContent content = null, CancellationToken cancellationToken = default)
+        public virtual Response WarmUp(SolutionWarmUpContent solutionWarmUpRequestBody = default, CancellationToken cancellationToken = default)
         {
-            using var scope = _selfHelpSolutionSolutionResourcesClientDiagnostics.CreateScope("SelfHelpSolutionResource.WarmUp");
+            using DiagnosticScope scope = _solutionResourcesClientDiagnostics.CreateScope("SelfHelpSolutionResource.WarmUp");
             scope.Start();
             try
             {
-                var response = _selfHelpSolutionSolutionResourcesRestClient.WarmUp(Id.Parent, Id.Name, content, cancellationToken);
+                RequestContext context = new RequestContext
+                {
+                    CancellationToken = cancellationToken
+                };
+                HttpMessage message = _solutionResourcesRestClient.CreateWarmUpRequest(Id.Parent, Id.Name, SolutionWarmUpContent.ToRequestContent(solutionWarmUpRequestBody), context);
+                Response response = Pipeline.ProcessMessage(message, context);
                 return response;
             }
             catch (Exception e)
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpSolutionResultCollection.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpSolutionResultCollection.cs
new file mode 100644
index 000000000000..326404f441b4
--- /dev/null
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpSolutionResultCollection.cs
@@ -0,0 +1,390 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Diagnostics;
+using System.Threading;
+using System.Threading.Tasks;
+using Azure;
+using Azure.Core;
+using Azure.Core.Pipeline;
+using Azure.ResourceManager;
+using Azure.ResourceManager.Resources;
+
+namespace Azure.ResourceManager.SelfHelp
+{
+    /// <summary>
+    /// A class representing a collection of <see cref="SelfHelpSolutionResultResource"/> and their operations.
+    /// Each <see cref="SelfHelpSolutionResultResource"/> in the collection will belong to the same instance of <see cref="TenantResource"/>.
+    /// To get a <see cref="SelfHelpSolutionResultCollection"/> instance call the GetSelfHelpSolutionResults method from an instance of <see cref="TenantResource"/>.
+    /// </summary>
+    public partial class SelfHelpSolutionResultCollection : ArmCollection
+    {
+        private readonly ClientDiagnostics _solutionSelfHelpClientDiagnostics;
+        private readonly SolutionSelfHelp _solutionSelfHelpRestClient;
+
+        /// <summary> Initializes a new instance of SelfHelpSolutionResultCollection for mocking. </summary>
+        protected SelfHelpSolutionResultCollection()
+        {
+        }
+
+        /// <summary> Initializes a new instance of <see cref="SelfHelpSolutionResultCollection"/> class. </summary>
+        /// <param name="client"> The client parameters to use in these operations. </param>
+        /// <param name="id"> The identifier of the resource that is the target of operations. </param>
+        internal SelfHelpSolutionResultCollection(ArmClient client, ResourceIdentifier id) : base(client, id)
+        {
+            TryGetApiVersion(SelfHelpSolutionResultResource.ResourceType, out string selfHelpSolutionResultApiVersion);
+            _solutionSelfHelpClientDiagnostics = new ClientDiagnostics("Azure.ResourceManager.SelfHelp", SelfHelpSolutionResultResource.ResourceType.Namespace, Diagnostics);
+            _solutionSelfHelpRestClient = new SolutionSelfHelp(_solutionSelfHelpClientDiagnostics, Pipeline, Endpoint, selfHelpSolutionResultApiVersion ?? "2024-03-01-preview");
+            ValidateResourceId(id);
+        }
+
+        /// <param name="id"></param>
+        [Conditional("DEBUG")]
+        internal static void ValidateResourceId(ResourceIdentifier id)
+        {
+            if (id.ResourceType != TenantResource.ResourceType)
+            {
+                throw new ArgumentException(string.Format("Invalid resource type {0} expected {1}", id.ResourceType, TenantResource.ResourceType), id);
+            }
+        }
+
+        /// <summary>
+        /// Gets Self Help Solutions for a given solutionId. Self Help Solutions consist of rich instructional video tutorials, links and guides to public documentation related to a specific problem that enables users to troubleshoot Azure issues.
+        /// <list type="bullet">
+        /// <item>
+        /// <term> Request Path. </term>
+        /// <description> /providers/Microsoft.Help/selfHelp/{solutionId}. </description>
+        /// </item>
+        /// <item>
+        /// <term> Operation Id. </term>
+        /// <description> SolutionResourceSelfHelps_Get. </description>
+        /// </item>
+        /// <item>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="solutionId"> SolutionId is a unique id to identify a solution. You can retrieve the solution id using the Discovery api - https://learn.microsoft.com/en-us/rest/api/help/discovery-solution/list?view=rest-help-2023-09-01-preview&amp;tabs=HTTP. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="solutionId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="solutionId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual async Task<Response<SelfHelpSolutionResultResource>> GetSelfHelpSolutionByIdAsync(string solutionId, CancellationToken cancellationToken = default)
+        {
+            Argument.AssertNotNullOrEmpty(solutionId, nameof(solutionId));
+
+            using DiagnosticScope scope = _solutionSelfHelpClientDiagnostics.CreateScope("SelfHelpSolutionResultCollection.GetSelfHelpSolutionById");
+            scope.Start();
+            try
+            {
+                RequestContext context = new RequestContext
+                {
+                    CancellationToken = cancellationToken
+                };
+                HttpMessage message = _solutionSelfHelpRestClient.CreateGetSelfHelpSolutionByIdRequest(solutionId, context);
+                Response result = await Pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
+                Response<SelfHelpSolutionResultData> response = Response.FromValue(SelfHelpSolutionResultData.FromResponse(result), result);
+                if (response.Value == null)
+                {
+                    throw new RequestFailedException(response.GetRawResponse());
+                }
+                return Response.FromValue(new SelfHelpSolutionResultResource(Client, response.Value), response.GetRawResponse());
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// Gets Self Help Solutions for a given solutionId. Self Help Solutions consist of rich instructional video tutorials, links and guides to public documentation related to a specific problem that enables users to troubleshoot Azure issues.
+        /// <list type="bullet">
+        /// <item>
+        /// <term> Request Path. </term>
+        /// <description> /providers/Microsoft.Help/selfHelp/{solutionId}. </description>
+        /// </item>
+        /// <item>
+        /// <term> Operation Id. </term>
+        /// <description> SolutionResourceSelfHelps_Get. </description>
+        /// </item>
+        /// <item>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="solutionId"> SolutionId is a unique id to identify a solution. You can retrieve the solution id using the Discovery api - https://learn.microsoft.com/en-us/rest/api/help/discovery-solution/list?view=rest-help-2023-09-01-preview&amp;tabs=HTTP. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="solutionId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="solutionId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual Response<SelfHelpSolutionResultResource> GetSelfHelpSolutionById(string solutionId, CancellationToken cancellationToken = default)
+        {
+            Argument.AssertNotNullOrEmpty(solutionId, nameof(solutionId));
+
+            using DiagnosticScope scope = _solutionSelfHelpClientDiagnostics.CreateScope("SelfHelpSolutionResultCollection.GetSelfHelpSolutionById");
+            scope.Start();
+            try
+            {
+                RequestContext context = new RequestContext
+                {
+                    CancellationToken = cancellationToken
+                };
+                HttpMessage message = _solutionSelfHelpRestClient.CreateGetSelfHelpSolutionByIdRequest(solutionId, context);
+                Response result = Pipeline.ProcessMessage(message, context);
+                Response<SelfHelpSolutionResultData> response = Response.FromValue(SelfHelpSolutionResultData.FromResponse(result), result);
+                if (response.Value == null)
+                {
+                    throw new RequestFailedException(response.GetRawResponse());
+                }
+                return Response.FromValue(new SelfHelpSolutionResultResource(Client, response.Value), response.GetRawResponse());
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// Gets Self Help Solutions for a given solutionId. Self Help Solutions consist of rich instructional video tutorials, links and guides to public documentation related to a specific problem that enables users to troubleshoot Azure issues.
+        /// <list type="bullet">
+        /// <item>
+        /// <term> Request Path. </term>
+        /// <description> /providers/Microsoft.Help/selfHelp/{solutionId}. </description>
+        /// </item>
+        /// <item>
+        /// <term> Operation Id. </term>
+        /// <description> SolutionResourceSelfHelps_Get. </description>
+        /// </item>
+        /// <item>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="solutionId"> SolutionId is a unique id to identify a solution. You can retrieve the solution id using the Discovery api - https://learn.microsoft.com/en-us/rest/api/help/discovery-solution/list?view=rest-help-2023-09-01-preview&amp;tabs=HTTP. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="solutionId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="solutionId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual async Task<Response<bool>> ExistsAsync(string solutionId, CancellationToken cancellationToken = default)
+        {
+            Argument.AssertNotNullOrEmpty(solutionId, nameof(solutionId));
+
+            using DiagnosticScope scope = _solutionSelfHelpClientDiagnostics.CreateScope("SelfHelpSolutionResultCollection.Exists");
+            scope.Start();
+            try
+            {
+                RequestContext context = new RequestContext
+                {
+                    CancellationToken = cancellationToken
+                };
+                HttpMessage message = _solutionSelfHelpRestClient.CreateGetSelfHelpSolutionByIdRequest(solutionId, context);
+                await Pipeline.SendAsync(message, context.CancellationToken).ConfigureAwait(false);
+                Response result = message.Response;
+                Response<SelfHelpSolutionResultData> response = default;
+                switch (result.Status)
+                {
+                    case 200:
+                        response = Response.FromValue(SelfHelpSolutionResultData.FromResponse(result), result);
+                        break;
+                    case 404:
+                        response = Response.FromValue((SelfHelpSolutionResultData)null, result);
+                        break;
+                    default:
+                        throw new RequestFailedException(result);
+                }
+                return Response.FromValue(response.Value != null, response.GetRawResponse());
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// Gets Self Help Solutions for a given solutionId. Self Help Solutions consist of rich instructional video tutorials, links and guides to public documentation related to a specific problem that enables users to troubleshoot Azure issues.
+        /// <list type="bullet">
+        /// <item>
+        /// <term> Request Path. </term>
+        /// <description> /providers/Microsoft.Help/selfHelp/{solutionId}. </description>
+        /// </item>
+        /// <item>
+        /// <term> Operation Id. </term>
+        /// <description> SolutionResourceSelfHelps_Get. </description>
+        /// </item>
+        /// <item>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="solutionId"> SolutionId is a unique id to identify a solution. You can retrieve the solution id using the Discovery api - https://learn.microsoft.com/en-us/rest/api/help/discovery-solution/list?view=rest-help-2023-09-01-preview&amp;tabs=HTTP. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="solutionId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="solutionId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual Response<bool> Exists(string solutionId, CancellationToken cancellationToken = default)
+        {
+            Argument.AssertNotNullOrEmpty(solutionId, nameof(solutionId));
+
+            using DiagnosticScope scope = _solutionSelfHelpClientDiagnostics.CreateScope("SelfHelpSolutionResultCollection.Exists");
+            scope.Start();
+            try
+            {
+                RequestContext context = new RequestContext
+                {
+                    CancellationToken = cancellationToken
+                };
+                HttpMessage message = _solutionSelfHelpRestClient.CreateGetSelfHelpSolutionByIdRequest(solutionId, context);
+                Pipeline.Send(message, context.CancellationToken);
+                Response result = message.Response;
+                Response<SelfHelpSolutionResultData> response = default;
+                switch (result.Status)
+                {
+                    case 200:
+                        response = Response.FromValue(SelfHelpSolutionResultData.FromResponse(result), result);
+                        break;
+                    case 404:
+                        response = Response.FromValue((SelfHelpSolutionResultData)null, result);
+                        break;
+                    default:
+                        throw new RequestFailedException(result);
+                }
+                return Response.FromValue(response.Value != null, response.GetRawResponse());
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// Gets Self Help Solutions for a given solutionId. Self Help Solutions consist of rich instructional video tutorials, links and guides to public documentation related to a specific problem that enables users to troubleshoot Azure issues.
+        /// <list type="bullet">
+        /// <item>
+        /// <term> Request Path. </term>
+        /// <description> /providers/Microsoft.Help/selfHelp/{solutionId}. </description>
+        /// </item>
+        /// <item>
+        /// <term> Operation Id. </term>
+        /// <description> SolutionResourceSelfHelps_Get. </description>
+        /// </item>
+        /// <item>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="solutionId"> SolutionId is a unique id to identify a solution. You can retrieve the solution id using the Discovery api - https://learn.microsoft.com/en-us/rest/api/help/discovery-solution/list?view=rest-help-2023-09-01-preview&amp;tabs=HTTP. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="solutionId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="solutionId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual async Task<NullableResponse<SelfHelpSolutionResultResource>> GetIfExistsAsync(string solutionId, CancellationToken cancellationToken = default)
+        {
+            Argument.AssertNotNullOrEmpty(solutionId, nameof(solutionId));
+
+            using DiagnosticScope scope = _solutionSelfHelpClientDiagnostics.CreateScope("SelfHelpSolutionResultCollection.GetIfExists");
+            scope.Start();
+            try
+            {
+                RequestContext context = new RequestContext
+                {
+                    CancellationToken = cancellationToken
+                };
+                HttpMessage message = _solutionSelfHelpRestClient.CreateGetSelfHelpSolutionByIdRequest(solutionId, context);
+                await Pipeline.SendAsync(message, context.CancellationToken).ConfigureAwait(false);
+                Response result = message.Response;
+                Response<SelfHelpSolutionResultData> response = default;
+                switch (result.Status)
+                {
+                    case 200:
+                        response = Response.FromValue(SelfHelpSolutionResultData.FromResponse(result), result);
+                        break;
+                    case 404:
+                        response = Response.FromValue((SelfHelpSolutionResultData)null, result);
+                        break;
+                    default:
+                        throw new RequestFailedException(result);
+                }
+                if (response.Value == null)
+                {
+                    return new NoValueResponse<SelfHelpSolutionResultResource>(response.GetRawResponse());
+                }
+                return Response.FromValue(new SelfHelpSolutionResultResource(Client, response.Value), response.GetRawResponse());
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// Gets Self Help Solutions for a given solutionId. Self Help Solutions consist of rich instructional video tutorials, links and guides to public documentation related to a specific problem that enables users to troubleshoot Azure issues.
+        /// <list type="bullet">
+        /// <item>
+        /// <term> Request Path. </term>
+        /// <description> /providers/Microsoft.Help/selfHelp/{solutionId}. </description>
+        /// </item>
+        /// <item>
+        /// <term> Operation Id. </term>
+        /// <description> SolutionResourceSelfHelps_Get. </description>
+        /// </item>
+        /// <item>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="solutionId"> SolutionId is a unique id to identify a solution. You can retrieve the solution id using the Discovery api - https://learn.microsoft.com/en-us/rest/api/help/discovery-solution/list?view=rest-help-2023-09-01-preview&amp;tabs=HTTP. </param>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="solutionId"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="solutionId"/> is an empty string, and was expected to be non-empty. </exception>
+        public virtual NullableResponse<SelfHelpSolutionResultResource> GetIfExists(string solutionId, CancellationToken cancellationToken = default)
+        {
+            Argument.AssertNotNullOrEmpty(solutionId, nameof(solutionId));
+
+            using DiagnosticScope scope = _solutionSelfHelpClientDiagnostics.CreateScope("SelfHelpSolutionResultCollection.GetIfExists");
+            scope.Start();
+            try
+            {
+                RequestContext context = new RequestContext
+                {
+                    CancellationToken = cancellationToken
+                };
+                HttpMessage message = _solutionSelfHelpRestClient.CreateGetSelfHelpSolutionByIdRequest(solutionId, context);
+                Pipeline.Send(message, context.CancellationToken);
+                Response result = message.Response;
+                Response<SelfHelpSolutionResultData> response = default;
+                switch (result.Status)
+                {
+                    case 200:
+                        response = Response.FromValue(SelfHelpSolutionResultData.FromResponse(result), result);
+                        break;
+                    case 404:
+                        response = Response.FromValue((SelfHelpSolutionResultData)null, result);
+                        break;
+                    default:
+                        throw new RequestFailedException(result);
+                }
+                if (response.Value == null)
+                {
+                    return new NoValueResponse<SelfHelpSolutionResultResource>(response.GetRawResponse());
+                }
+                return Response.FromValue(new SelfHelpSolutionResultResource(Client, response.Value), response.GetRawResponse());
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+    }
+}
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpSolutionResultData.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpSolutionResultData.Serialization.cs
new file mode 100644
index 000000000000..ff65630457b6
--- /dev/null
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpSolutionResultData.Serialization.cs
@@ -0,0 +1,184 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+using System.Text;
+using System.Text.Json;
+using Azure;
+using Azure.Core;
+using Azure.ResourceManager.Models;
+using Azure.ResourceManager.SelfHelp.Models;
+
+namespace Azure.ResourceManager.SelfHelp
+{
+    /// <summary> Self Help Solution response. </summary>
+    public partial class SelfHelpSolutionResultData : ResourceData, IJsonModel<SelfHelpSolutionResultData>
+    {
+        /// <param name="writer"> The JSON writer. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        void IJsonModel<SelfHelpSolutionResultData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            writer.WriteStartObject();
+            JsonModelWriteCore(writer, options);
+            writer.WriteEndObject();
+        }
+
+        /// <param name="writer"> The JSON writer. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpSolutionResultData>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(SelfHelpSolutionResultData)} does not support writing '{format}' format.");
+            }
+            base.JsonModelWriteCore(writer, options);
+            if (Optional.IsDefined(Properties))
+            {
+                writer.WritePropertyName("properties"u8);
+                writer.WriteObjectValue(Properties, options);
+            }
+        }
+
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        SelfHelpSolutionResultData IJsonModel<SelfHelpSolutionResultData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => (SelfHelpSolutionResultData)JsonModelCreateCore(ref reader, options);
+
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual ResourceData JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpSolutionResultData>)this).GetFormatFromOptions(options) : options.Format;
+            if (format != "J")
+            {
+                throw new FormatException($"The model {nameof(SelfHelpSolutionResultData)} does not support reading '{format}' format.");
+            }
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeSelfHelpSolutionResultData(document.RootElement, options);
+        }
+
+        /// <param name="element"> The JSON element to deserialize. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        internal static SelfHelpSolutionResultData DeserializeSelfHelpSolutionResultData(JsonElement element, ModelReaderWriterOptions options)
+        {
+            if (element.ValueKind == JsonValueKind.Null)
+            {
+                return null;
+            }
+            ResourceIdentifier id = default;
+            string name = default;
+            ResourceType resourceType = default;
+            SystemData systemData = default;
+            IDictionary<string, BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            SolutionsResourcePropertiesSelfHelp properties = default;
+            foreach (var prop in element.EnumerateObject())
+            {
+                if (prop.NameEquals("id"u8))
+                {
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    id = new ResourceIdentifier(prop.Value.GetString());
+                    continue;
+                }
+                if (prop.NameEquals("name"u8))
+                {
+                    name = prop.Value.GetString();
+                    continue;
+                }
+                if (prop.NameEquals("type"u8))
+                {
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    resourceType = new ResourceType(prop.Value.GetString());
+                    continue;
+                }
+                if (prop.NameEquals("systemData"u8))
+                {
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    systemData = ModelReaderWriter.Read<SystemData>(new BinaryData(Encoding.UTF8.GetBytes(prop.Value.GetRawText())), ModelSerializationExtensions.WireOptions, AzureResourceManagerSelfHelpContext.Default);
+                    continue;
+                }
+                if (prop.NameEquals("properties"u8))
+                {
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    properties = SolutionsResourcePropertiesSelfHelp.DeserializeSolutionsResourcePropertiesSelfHelp(prop.Value, options);
+                    continue;
+                }
+                if (options.Format != "W")
+                {
+                    additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText()));
+                }
+            }
+            return new SelfHelpSolutionResultData(
+                id,
+                name,
+                resourceType,
+                systemData,
+                additionalBinaryDataProperties,
+                properties);
+        }
+
+        /// <param name="options"> The client options for reading and writing models. </param>
+        BinaryData IPersistableModel<SelfHelpSolutionResultData>.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
+
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpSolutionResultData>)this).GetFormatFromOptions(options) : options.Format;
+            switch (format)
+            {
+                case "J":
+                    return ModelReaderWriter.Write(this, options, AzureResourceManagerSelfHelpContext.Default);
+                default:
+                    throw new FormatException($"The model {nameof(SelfHelpSolutionResultData)} does not support writing '{options.Format}' format.");
+            }
+        }
+
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        SelfHelpSolutionResultData IPersistableModel<SelfHelpSolutionResultData>.Create(BinaryData data, ModelReaderWriterOptions options) => (SelfHelpSolutionResultData)PersistableModelCreateCore(data, options);
+
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual ResourceData PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpSolutionResultData>)this).GetFormatFromOptions(options) : options.Format;
+            switch (format)
+            {
+                case "J":
+                    using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
+                    {
+                        return DeserializeSelfHelpSolutionResultData(document.RootElement, options);
+                    }
+                default:
+                    throw new FormatException($"The model {nameof(SelfHelpSolutionResultData)} does not support reading '{options.Format}' format.");
+            }
+        }
+
+        /// <param name="options"> The client options for reading and writing models. </param>
+        string IPersistableModel<SelfHelpSolutionResultData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <param name="response"> The <see cref="Response"/> to deserialize the <see cref="SelfHelpSolutionResultData"/> from. </param>
+        internal static SelfHelpSolutionResultData FromResponse(Response response)
+        {
+            using JsonDocument document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions);
+            return DeserializeSelfHelpSolutionResultData(document.RootElement, ModelSerializationExtensions.WireOptions);
+        }
+    }
+}
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpSolutionResultData.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpSolutionResultData.cs
new file mode 100644
index 000000000000..344ea243cbea
--- /dev/null
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpSolutionResultData.cs
@@ -0,0 +1,92 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Collections.Generic;
+using Azure.Core;
+using Azure.ResourceManager.Models;
+using Azure.ResourceManager.SelfHelp.Models;
+
+namespace Azure.ResourceManager.SelfHelp
+{
+    /// <summary> Self Help Solution response. </summary>
+    public partial class SelfHelpSolutionResultData : ResourceData
+    {
+        /// <summary> Keeps track of any properties unknown to the library. </summary>
+        private protected readonly IDictionary<string, BinaryData> _additionalBinaryDataProperties;
+
+        /// <summary> Initializes a new instance of <see cref="SelfHelpSolutionResultData"/>. </summary>
+        public SelfHelpSolutionResultData()
+        {
+        }
+
+        /// <summary> Initializes a new instance of <see cref="SelfHelpSolutionResultData"/>. </summary>
+        /// <param name="id"> Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. </param>
+        /// <param name="name"> The name of the resource. </param>
+        /// <param name="resourceType"> The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts". </param>
+        /// <param name="systemData"> Azure Resource Manager metadata containing createdBy and modifiedBy information. </param>
+        /// <param name="additionalBinaryDataProperties"> Keeps track of any properties unknown to the library. </param>
+        /// <param name="properties"> Solution result. </param>
+        internal SelfHelpSolutionResultData(ResourceIdentifier id, string name, ResourceType resourceType, SystemData systemData, IDictionary<string, BinaryData> additionalBinaryDataProperties, SolutionsResourcePropertiesSelfHelp properties) : base(id, name, resourceType, systemData)
+        {
+            _additionalBinaryDataProperties = additionalBinaryDataProperties;
+            Properties = properties;
+        }
+
+        /// <summary> Solution result. </summary>
+        internal SolutionsResourcePropertiesSelfHelp Properties { get; set; }
+
+        /// <summary> SolutionId is a unique id to identify a solution. You can retrieve the solution id using the Discovery api - https://learn.microsoft.com/en-us/rest/api/help/discovery-solution/list?view=rest-help-2023-09-01-preview&amp;tabs=HTTP. </summary>
+        public string SolutionId
+        {
+            get
+            {
+                return Properties is null ? default : Properties.SolutionId;
+            }
+        }
+
+        /// <summary> The title. </summary>
+        public string Title
+        {
+            get
+            {
+                return Properties is null ? default : Properties.Title;
+            }
+        }
+
+        /// <summary> The HTML content that needs to be rendered and shown to customer. </summary>
+        public string Content
+        {
+            get
+            {
+                return Properties is null ? default : Properties.Content;
+            }
+        }
+
+        /// <summary> Solution replacement maps. </summary>
+        public ReplacementMapsResult ReplacementMaps
+        {
+            get
+            {
+                return Properties is null ? default : Properties.ReplacementMaps;
+            }
+        }
+
+        /// <summary> List of section object. </summary>
+        public IReadOnlyList<SolutionSection> Sections
+        {
+            get
+            {
+                if (Properties is null)
+                {
+                    Properties = new SolutionsResourcePropertiesSelfHelp();
+                }
+                return Properties.Sections;
+            }
+        }
+    }
+}
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpSolutionResultResource.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpSolutionResultResource.Serialization.cs
new file mode 100644
index 000000000000..74309873b315
--- /dev/null
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpSolutionResultResource.Serialization.cs
@@ -0,0 +1,39 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.ClientModel.Primitives;
+using System.Text.Json;
+
+namespace Azure.ResourceManager.SelfHelp
+{
+    /// <summary></summary>
+    public partial class SelfHelpSolutionResultResource : IJsonModel<SelfHelpSolutionResultData>
+    {
+        private static IJsonModel<SelfHelpSolutionResultData> s_dataDeserializationInstance;
+
+        private static IJsonModel<SelfHelpSolutionResultData> DataDeserializationInstance => s_dataDeserializationInstance ??= new SelfHelpSolutionResultData();
+
+        /// <param name="writer"> The writer to serialize the model to. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        void IJsonModel<SelfHelpSolutionResultData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => ((IJsonModel<SelfHelpSolutionResultData>)Data).Write(writer, options);
+
+        /// <param name="reader"> The reader for deserializing the model. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        SelfHelpSolutionResultData IJsonModel<SelfHelpSolutionResultData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => DataDeserializationInstance.Create(ref reader, options);
+
+        /// <param name="options"> The client options for reading and writing models. </param>
+        BinaryData IPersistableModel<SelfHelpSolutionResultData>.Write(ModelReaderWriterOptions options) => ModelReaderWriter.Write<SelfHelpSolutionResultData>(Data, options, AzureResourceManagerSelfHelpContext.Default);
+
+        /// <param name="data"> The binary data to be processed. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        SelfHelpSolutionResultData IPersistableModel<SelfHelpSolutionResultData>.Create(BinaryData data, ModelReaderWriterOptions options) => ModelReaderWriter.Read<SelfHelpSolutionResultData>(data, options, AzureResourceManagerSelfHelpContext.Default);
+
+        /// <param name="options"> The client options for reading and writing models. </param>
+        string IPersistableModel<SelfHelpSolutionResultData>.GetFormatFromOptions(ModelReaderWriterOptions options) => DataDeserializationInstance.GetFormatFromOptions(options);
+    }
+}
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpSolutionResultResource.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpSolutionResultResource.cs
new file mode 100644
index 000000000000..1226d31e5283
--- /dev/null
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpSolutionResultResource.cs
@@ -0,0 +1,188 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System;
+using System.Diagnostics;
+using System.Threading;
+using System.Threading.Tasks;
+using Azure;
+using Azure.Core;
+using Azure.Core.Pipeline;
+using Azure.ResourceManager;
+using Azure.ResourceManager.Resources;
+
+namespace Azure.ResourceManager.SelfHelp
+{
+    /// <summary>
+    /// A class representing a SelfHelpSolutionResult along with the instance operations that can be performed on it.
+    /// If you have a <see cref="ResourceIdentifier"/> you can construct a <see cref="SelfHelpSolutionResultResource"/> from an instance of <see cref="ArmClient"/> using the GetResource method.
+    /// Otherwise you can get one from its parent resource <see cref="TenantResource"/> using the GetSelfHelpSolutionResults method.
+    /// </summary>
+    public partial class SelfHelpSolutionResultResource : ArmResource
+    {
+        private readonly ClientDiagnostics _solutionSelfHelpClientDiagnostics;
+        private readonly SolutionSelfHelp _solutionSelfHelpRestClient;
+        private readonly SelfHelpSolutionResultData _data;
+        /// <summary> Gets the resource type for the operations. </summary>
+        public static readonly ResourceType ResourceType = "Microsoft.Help/selfHelp";
+
+        /// <summary> Initializes a new instance of SelfHelpSolutionResultResource for mocking. </summary>
+        protected SelfHelpSolutionResultResource()
+        {
+        }
+
+        /// <summary> Initializes a new instance of <see cref="SelfHelpSolutionResultResource"/> class. </summary>
+        /// <param name="client"> The client parameters to use in these operations. </param>
+        /// <param name="data"> The resource that is the target of operations. </param>
+        internal SelfHelpSolutionResultResource(ArmClient client, SelfHelpSolutionResultData data) : this(client, data.Id)
+        {
+            HasData = true;
+            _data = data;
+        }
+
+        /// <summary> Initializes a new instance of <see cref="SelfHelpSolutionResultResource"/> class. </summary>
+        /// <param name="client"> The client parameters to use in these operations. </param>
+        /// <param name="id"> The identifier of the resource that is the target of operations. </param>
+        internal SelfHelpSolutionResultResource(ArmClient client, ResourceIdentifier id) : base(client, id)
+        {
+            TryGetApiVersion(ResourceType, out string selfHelpSolutionResultApiVersion);
+            _solutionSelfHelpClientDiagnostics = new ClientDiagnostics("Azure.ResourceManager.SelfHelp", ResourceType.Namespace, Diagnostics);
+            _solutionSelfHelpRestClient = new SolutionSelfHelp(_solutionSelfHelpClientDiagnostics, Pipeline, Endpoint, selfHelpSolutionResultApiVersion ?? "2024-03-01-preview");
+            ValidateResourceId(id);
+        }
+
+        /// <summary> Gets whether or not the current instance has data. </summary>
+        public virtual bool HasData { get; }
+
+        /// <summary> Gets the data representing this Feature. </summary>
+        public virtual SelfHelpSolutionResultData Data
+        {
+            get
+            {
+                if (!HasData)
+                {
+                    throw new InvalidOperationException("The current instance does not have data, you must call Get first.");
+                }
+                return _data;
+            }
+        }
+
+        /// <summary> Generate the resource identifier for this resource. </summary>
+        /// <param name="solutionId"> The solutionId. </param>
+        public static ResourceIdentifier CreateResourceIdentifier(string solutionId)
+        {
+            string resourceId = $"/providers/Microsoft.Help/selfHelp/{solutionId}";
+            return new ResourceIdentifier(resourceId);
+        }
+
+        /// <param name="id"></param>
+        [Conditional("DEBUG")]
+        internal static void ValidateResourceId(ResourceIdentifier id)
+        {
+            if (id.ResourceType != ResourceType)
+            {
+                throw new ArgumentException(string.Format("Invalid resource type {0} expected {1}", id.ResourceType, ResourceType), id);
+            }
+        }
+
+        /// <summary>
+        /// Gets Self Help Solutions for a given solutionId. Self Help Solutions consist of rich instructional video tutorials, links and guides to public documentation related to a specific problem that enables users to troubleshoot Azure issues.
+        /// <list type="bullet">
+        /// <item>
+        /// <term> Request Path. </term>
+        /// <description> /providers/Microsoft.Help/selfHelp/{solutionId}. </description>
+        /// </item>
+        /// <item>
+        /// <term> Operation Id. </term>
+        /// <description> SolutionResourceSelfHelps_Get. </description>
+        /// </item>
+        /// <item>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
+        /// </item>
+        /// <item>
+        /// <term> Resource. </term>
+        /// <description> <see cref="SelfHelpSolutionResultResource"/>. </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        public virtual async Task<Response<SelfHelpSolutionResultResource>> GetAsync(CancellationToken cancellationToken = default)
+        {
+            using DiagnosticScope scope = _solutionSelfHelpClientDiagnostics.CreateScope("SelfHelpSolutionResultResource.Get");
+            scope.Start();
+            try
+            {
+                RequestContext context = new RequestContext
+                {
+                    CancellationToken = cancellationToken
+                };
+                HttpMessage message = _solutionSelfHelpRestClient.CreateGetSelfHelpSolutionByIdRequest(Id.Name, context);
+                Response result = await Pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
+                Response<SelfHelpSolutionResultData> response = Response.FromValue(SelfHelpSolutionResultData.FromResponse(result), result);
+                if (response.Value == null)
+                {
+                    throw new RequestFailedException(response.GetRawResponse());
+                }
+                return Response.FromValue(new SelfHelpSolutionResultResource(Client, response.Value), response.GetRawResponse());
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+
+        /// <summary>
+        /// Gets Self Help Solutions for a given solutionId. Self Help Solutions consist of rich instructional video tutorials, links and guides to public documentation related to a specific problem that enables users to troubleshoot Azure issues.
+        /// <list type="bullet">
+        /// <item>
+        /// <term> Request Path. </term>
+        /// <description> /providers/Microsoft.Help/selfHelp/{solutionId}. </description>
+        /// </item>
+        /// <item>
+        /// <term> Operation Id. </term>
+        /// <description> SolutionResourceSelfHelps_Get. </description>
+        /// </item>
+        /// <item>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
+        /// </item>
+        /// <item>
+        /// <term> Resource. </term>
+        /// <description> <see cref="SelfHelpSolutionResultResource"/>. </description>
+        /// </item>
+        /// </list>
+        /// </summary>
+        /// <param name="cancellationToken"> The cancellation token to use. </param>
+        public virtual Response<SelfHelpSolutionResultResource> Get(CancellationToken cancellationToken = default)
+        {
+            using DiagnosticScope scope = _solutionSelfHelpClientDiagnostics.CreateScope("SelfHelpSolutionResultResource.Get");
+            scope.Start();
+            try
+            {
+                RequestContext context = new RequestContext
+                {
+                    CancellationToken = cancellationToken
+                };
+                HttpMessage message = _solutionSelfHelpRestClient.CreateGetSelfHelpSolutionByIdRequest(Id.Name, context);
+                Response result = Pipeline.ProcessMessage(message, context);
+                Response<SelfHelpSolutionResultData> response = Response.FromValue(SelfHelpSolutionResultData.FromResponse(result), result);
+                if (response.Value == null)
+                {
+                    throw new RequestFailedException(response.GetRawResponse());
+                }
+                return Response.FromValue(new SelfHelpSolutionResultResource(Client, response.Value), response.GetRawResponse());
+            }
+            catch (Exception e)
+            {
+                scope.Failed(e);
+                throw;
+            }
+        }
+    }
+}
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpTroubleshooterCollection.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpTroubleshooterCollection.cs
index 32393889c36a..13a32499a84a 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpTroubleshooterCollection.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpTroubleshooterCollection.cs
@@ -8,8 +8,10 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
+using Azure;
 using Azure.Core;
 using Azure.Core.Pipeline;
+using Azure.ResourceManager;
 
 namespace Azure.ResourceManager.SelfHelp
 {
@@ -20,42 +22,38 @@ namespace Azure.ResourceManager.SelfHelp
     /// </summary>
     public partial class SelfHelpTroubleshooterCollection : ArmCollection
     {
-        private readonly ClientDiagnostics _selfHelpTroubleshooterTroubleshooterResourcesClientDiagnostics;
-        private readonly TroubleshooterResourcesRestOperations _selfHelpTroubleshooterTroubleshooterResourcesRestClient;
+        private readonly ClientDiagnostics _troubleshooterResourcesClientDiagnostics;
+        private readonly TroubleshooterResources _troubleshooterResourcesRestClient;
 
-        /// <summary> Initializes a new instance of the <see cref="SelfHelpTroubleshooterCollection"/> class for mocking. </summary>
+        /// <summary> Initializes a new instance of SelfHelpTroubleshooterCollection for mocking. </summary>
         protected SelfHelpTroubleshooterCollection()
         {
         }
 
-        /// <summary> Initializes a new instance of the <see cref="SelfHelpTroubleshooterCollection"/> class. </summary>
+        /// <summary> Initializes a new instance of <see cref="SelfHelpTroubleshooterCollection"/> class. </summary>
         /// <param name="client"> The client parameters to use in these operations. </param>
-        /// <param name="id"> The identifier of the parent resource that is the target of operations. </param>
+        /// <param name="id"> The identifier of the resource that is the target of operations. </param>
         internal SelfHelpTroubleshooterCollection(ArmClient client, ResourceIdentifier id) : base(client, id)
         {
-            _selfHelpTroubleshooterTroubleshooterResourcesClientDiagnostics = new ClientDiagnostics("Azure.ResourceManager.SelfHelp", SelfHelpTroubleshooterResource.ResourceType.Namespace, Diagnostics);
-            TryGetApiVersion(SelfHelpTroubleshooterResource.ResourceType, out string selfHelpTroubleshooterTroubleshooterResourcesApiVersion);
-            _selfHelpTroubleshooterTroubleshooterResourcesRestClient = new TroubleshooterResourcesRestOperations(Pipeline, Diagnostics.ApplicationId, Endpoint, selfHelpTroubleshooterTroubleshooterResourcesApiVersion);
+            TryGetApiVersion(SelfHelpTroubleshooterResource.ResourceType, out string selfHelpTroubleshooterApiVersion);
+            _troubleshooterResourcesClientDiagnostics = new ClientDiagnostics("Azure.ResourceManager.SelfHelp", SelfHelpTroubleshooterResource.ResourceType.Namespace, Diagnostics);
+            _troubleshooterResourcesRestClient = new TroubleshooterResources(_troubleshooterResourcesClientDiagnostics, Pipeline, Endpoint, selfHelpTroubleshooterApiVersion ?? "2024-03-01-preview");
         }
 
         /// <summary>
         /// Creates the specific troubleshooter action under a resource or subscription using the ‘solutionId’ and  ‘properties.parameters’ as the trigger. &lt;br/&gt; Azure Troubleshooters help with hard to classify issues, reducing the gap between customer observed problems and solutions by guiding the user effortlessly through the troubleshooting process. Each Troubleshooter flow represents a problem area within Azure and has a complex tree-like structure that addresses many root causes. These flows are prepared with the help of Subject Matter experts and customer support engineers by carefully considering previous support requests raised by customers. Troubleshooters terminate at a well curated solution based off of resource backend signals and customer manual selections.
         /// <list type="bullet">
         /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/troubleshooters/{troubleshooterName}</description>
+        /// <term> Request Path. </term>
+        /// <description> /{scope}/providers/Microsoft.Help/troubleshooters/{troubleshooterName}. </description>
         /// </item>
         /// <item>
-        /// <term>Operation Id</term>
-        /// <description>TroubleshooterResource_Create</description>
+        /// <term> Operation Id. </term>
+        /// <description> TroubleshooterResources_Create. </description>
         /// </item>
         /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
-        /// </item>
-        /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpTroubleshooterResource"/></description>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
         /// </item>
         /// </list>
         /// </summary>
@@ -63,23 +61,30 @@ internal SelfHelpTroubleshooterCollection(ArmClient client, ResourceIdentifier i
         /// <param name="troubleshooterName"> Troubleshooter resource Name. </param>
         /// <param name="data"> The required request body for this Troubleshooter resource creation. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="troubleshooterName"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="troubleshooterName"/> is an empty string, and was expected to be non-empty. </exception>
-        /// <exception cref="ArgumentNullException"> <paramref name="troubleshooterName"/> or <paramref name="data"/> is null. </exception>
-        public virtual async Task<ArmOperation<SelfHelpTroubleshooterResource>> CreateOrUpdateAsync(WaitUntil waitUntil, string troubleshooterName, SelfHelpTroubleshooterData data, CancellationToken cancellationToken = default)
+        public virtual async Task<ArmOperation<SelfHelpTroubleshooterResource>> CreateOrUpdateAsync(WaitUntil waitUntil, string troubleshooterName, SelfHelpTroubleshooterData data = default, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(troubleshooterName, nameof(troubleshooterName));
-            Argument.AssertNotNull(data, nameof(data));
 
-            using var scope = _selfHelpTroubleshooterTroubleshooterResourcesClientDiagnostics.CreateScope("SelfHelpTroubleshooterCollection.CreateOrUpdate");
+            using DiagnosticScope scope = _troubleshooterResourcesClientDiagnostics.CreateScope("SelfHelpTroubleshooterCollection.CreateOrUpdate");
             scope.Start();
             try
             {
-                var response = await _selfHelpTroubleshooterTroubleshooterResourcesRestClient.CreateAsync(Id, troubleshooterName, data, cancellationToken).ConfigureAwait(false);
-                var uri = _selfHelpTroubleshooterTroubleshooterResourcesRestClient.CreateCreateRequestUri(Id, troubleshooterName, data);
-                var rehydrationToken = NextLinkOperationImplementation.GetRehydrationToken(RequestMethod.Put, uri.ToUri(), uri.ToString(), "None", null, OperationFinalStateVia.OriginalUri.ToString());
-                var operation = new SelfHelpArmOperation<SelfHelpTroubleshooterResource>(Response.FromValue(new SelfHelpTroubleshooterResource(Client, response), response.GetRawResponse()), rehydrationToken);
+                RequestContext context = new RequestContext
+                {
+                    CancellationToken = cancellationToken
+                };
+                HttpMessage message = _troubleshooterResourcesRestClient.CreateCreateRequest(Id, troubleshooterName, SelfHelpTroubleshooterData.ToRequestContent(data), context);
+                Response result = await Pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
+                Response<SelfHelpTroubleshooterData> response = Response.FromValue(SelfHelpTroubleshooterData.FromResponse(result), result);
+                RequestUriBuilder uri = message.Request.Uri;
+                RehydrationToken rehydrationToken = NextLinkOperationImplementation.GetRehydrationToken(RequestMethod.Put, uri.ToUri(), uri.ToString(), "None", null, OperationFinalStateVia.OriginalUri.ToString());
+                SelfHelpArmOperation<SelfHelpTroubleshooterResource> operation = new SelfHelpArmOperation<SelfHelpTroubleshooterResource>(Response.FromValue(new SelfHelpTroubleshooterResource(Client, response.Value), response.GetRawResponse()), rehydrationToken);
                 if (waitUntil == WaitUntil.Completed)
+                {
                     await operation.WaitForCompletionAsync(cancellationToken).ConfigureAwait(false);
+                }
                 return operation;
             }
             catch (Exception e)
@@ -93,20 +98,16 @@ public virtual async Task<ArmOperation<SelfHelpTroubleshooterResource>> CreateOr
         /// Creates the specific troubleshooter action under a resource or subscription using the ‘solutionId’ and  ‘properties.parameters’ as the trigger. &lt;br/&gt; Azure Troubleshooters help with hard to classify issues, reducing the gap between customer observed problems and solutions by guiding the user effortlessly through the troubleshooting process. Each Troubleshooter flow represents a problem area within Azure and has a complex tree-like structure that addresses many root causes. These flows are prepared with the help of Subject Matter experts and customer support engineers by carefully considering previous support requests raised by customers. Troubleshooters terminate at a well curated solution based off of resource backend signals and customer manual selections.
         /// <list type="bullet">
         /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/troubleshooters/{troubleshooterName}</description>
-        /// </item>
-        /// <item>
-        /// <term>Operation Id</term>
-        /// <description>TroubleshooterResource_Create</description>
+        /// <term> Request Path. </term>
+        /// <description> /{scope}/providers/Microsoft.Help/troubleshooters/{troubleshooterName}. </description>
         /// </item>
         /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
+        /// <term> Operation Id. </term>
+        /// <description> TroubleshooterResources_Create. </description>
         /// </item>
         /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpTroubleshooterResource"/></description>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
         /// </item>
         /// </list>
         /// </summary>
@@ -114,23 +115,30 @@ public virtual async Task<ArmOperation<SelfHelpTroubleshooterResource>> CreateOr
         /// <param name="troubleshooterName"> Troubleshooter resource Name. </param>
         /// <param name="data"> The required request body for this Troubleshooter resource creation. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
+        /// <exception cref="ArgumentNullException"> <paramref name="troubleshooterName"/> is null. </exception>
         /// <exception cref="ArgumentException"> <paramref name="troubleshooterName"/> is an empty string, and was expected to be non-empty. </exception>
-        /// <exception cref="ArgumentNullException"> <paramref name="troubleshooterName"/> or <paramref name="data"/> is null. </exception>
-        public virtual ArmOperation<SelfHelpTroubleshooterResource> CreateOrUpdate(WaitUntil waitUntil, string troubleshooterName, SelfHelpTroubleshooterData data, CancellationToken cancellationToken = default)
+        public virtual ArmOperation<SelfHelpTroubleshooterResource> CreateOrUpdate(WaitUntil waitUntil, string troubleshooterName, SelfHelpTroubleshooterData data = default, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(troubleshooterName, nameof(troubleshooterName));
-            Argument.AssertNotNull(data, nameof(data));
 
-            using var scope = _selfHelpTroubleshooterTroubleshooterResourcesClientDiagnostics.CreateScope("SelfHelpTroubleshooterCollection.CreateOrUpdate");
+            using DiagnosticScope scope = _troubleshooterResourcesClientDiagnostics.CreateScope("SelfHelpTroubleshooterCollection.CreateOrUpdate");
             scope.Start();
             try
             {
-                var response = _selfHelpTroubleshooterTroubleshooterResourcesRestClient.Create(Id, troubleshooterName, data, cancellationToken);
-                var uri = _selfHelpTroubleshooterTroubleshooterResourcesRestClient.CreateCreateRequestUri(Id, troubleshooterName, data);
-                var rehydrationToken = NextLinkOperationImplementation.GetRehydrationToken(RequestMethod.Put, uri.ToUri(), uri.ToString(), "None", null, OperationFinalStateVia.OriginalUri.ToString());
-                var operation = new SelfHelpArmOperation<SelfHelpTroubleshooterResource>(Response.FromValue(new SelfHelpTroubleshooterResource(Client, response), response.GetRawResponse()), rehydrationToken);
+                RequestContext context = new RequestContext
+                {
+                    CancellationToken = cancellationToken
+                };
+                HttpMessage message = _troubleshooterResourcesRestClient.CreateCreateRequest(Id, troubleshooterName, SelfHelpTroubleshooterData.ToRequestContent(data), context);
+                Response result = Pipeline.ProcessMessage(message, context);
+                Response<SelfHelpTroubleshooterData> response = Response.FromValue(SelfHelpTroubleshooterData.FromResponse(result), result);
+                RequestUriBuilder uri = message.Request.Uri;
+                RehydrationToken rehydrationToken = NextLinkOperationImplementation.GetRehydrationToken(RequestMethod.Put, uri.ToUri(), uri.ToString(), "None", null, OperationFinalStateVia.OriginalUri.ToString());
+                SelfHelpArmOperation<SelfHelpTroubleshooterResource> operation = new SelfHelpArmOperation<SelfHelpTroubleshooterResource>(Response.FromValue(new SelfHelpTroubleshooterResource(Client, response.Value), response.GetRawResponse()), rehydrationToken);
                 if (waitUntil == WaitUntil.Completed)
+                {
                     operation.WaitForCompletion(cancellationToken);
+                }
                 return operation;
             }
             catch (Exception e)
@@ -144,38 +152,42 @@ public virtual ArmOperation<SelfHelpTroubleshooterResource> CreateOrUpdate(WaitU
         /// Gets troubleshooter instance result which includes the step status/result of the troubleshooter resource name that is being executed.&lt;br/&gt; Get API is used to retrieve the result of a Troubleshooter instance, which includes the status and result of each step in the Troubleshooter workflow. This API requires the Troubleshooter resource name that was created using the Create API.
         /// <list type="bullet">
         /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/troubleshooters/{troubleshooterName}</description>
-        /// </item>
-        /// <item>
-        /// <term>Operation Id</term>
-        /// <description>TroubleshooterResource_Get</description>
+        /// <term> Request Path. </term>
+        /// <description> /{scope}/providers/Microsoft.Help/troubleshooters/{troubleshooterName}. </description>
         /// </item>
         /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
+        /// <term> Operation Id. </term>
+        /// <description> TroubleshooterResources_Get. </description>
         /// </item>
         /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpTroubleshooterResource"/></description>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="troubleshooterName"> Troubleshooter resource Name. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentException"> <paramref name="troubleshooterName"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="ArgumentNullException"> <paramref name="troubleshooterName"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="troubleshooterName"/> is an empty string, and was expected to be non-empty. </exception>
         public virtual async Task<Response<SelfHelpTroubleshooterResource>> GetAsync(string troubleshooterName, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(troubleshooterName, nameof(troubleshooterName));
 
-            using var scope = _selfHelpTroubleshooterTroubleshooterResourcesClientDiagnostics.CreateScope("SelfHelpTroubleshooterCollection.Get");
+            using DiagnosticScope scope = _troubleshooterResourcesClientDiagnostics.CreateScope("SelfHelpTroubleshooterCollection.Get");
             scope.Start();
             try
             {
-                var response = await _selfHelpTroubleshooterTroubleshooterResourcesRestClient.GetAsync(Id, troubleshooterName, cancellationToken).ConfigureAwait(false);
+                RequestContext context = new RequestContext
+                {
+                    CancellationToken = cancellationToken
+                };
+                HttpMessage message = _troubleshooterResourcesRestClient.CreateGetRequest(Id, troubleshooterName, context);
+                Response result = await Pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
+                Response<SelfHelpTroubleshooterData> response = Response.FromValue(SelfHelpTroubleshooterData.FromResponse(result), result);
                 if (response.Value == null)
+                {
                     throw new RequestFailedException(response.GetRawResponse());
+                }
                 return Response.FromValue(new SelfHelpTroubleshooterResource(Client, response.Value), response.GetRawResponse());
             }
             catch (Exception e)
@@ -189,38 +201,42 @@ public virtual async Task<Response<SelfHelpTroubleshooterResource>> GetAsync(str
         /// Gets troubleshooter instance result which includes the step status/result of the troubleshooter resource name that is being executed.&lt;br/&gt; Get API is used to retrieve the result of a Troubleshooter instance, which includes the status and result of each step in the Troubleshooter workflow. This API requires the Troubleshooter resource name that was created using the Create API.
         /// <list type="bullet">
         /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/troubleshooters/{troubleshooterName}</description>
-        /// </item>
-        /// <item>
-        /// <term>Operation Id</term>
-        /// <description>TroubleshooterResource_Get</description>
+        /// <term> Request Path. </term>
+        /// <description> /{scope}/providers/Microsoft.Help/troubleshooters/{troubleshooterName}. </description>
         /// </item>
         /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
+        /// <term> Operation Id. </term>
+        /// <description> TroubleshooterResources_Get. </description>
         /// </item>
         /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpTroubleshooterResource"/></description>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="troubleshooterName"> Troubleshooter resource Name. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentException"> <paramref name="troubleshooterName"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="ArgumentNullException"> <paramref name="troubleshooterName"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="troubleshooterName"/> is an empty string, and was expected to be non-empty. </exception>
         public virtual Response<SelfHelpTroubleshooterResource> Get(string troubleshooterName, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(troubleshooterName, nameof(troubleshooterName));
 
-            using var scope = _selfHelpTroubleshooterTroubleshooterResourcesClientDiagnostics.CreateScope("SelfHelpTroubleshooterCollection.Get");
+            using DiagnosticScope scope = _troubleshooterResourcesClientDiagnostics.CreateScope("SelfHelpTroubleshooterCollection.Get");
             scope.Start();
             try
             {
-                var response = _selfHelpTroubleshooterTroubleshooterResourcesRestClient.Get(Id, troubleshooterName, cancellationToken);
+                RequestContext context = new RequestContext
+                {
+                    CancellationToken = cancellationToken
+                };
+                HttpMessage message = _troubleshooterResourcesRestClient.CreateGetRequest(Id, troubleshooterName, context);
+                Response result = Pipeline.ProcessMessage(message, context);
+                Response<SelfHelpTroubleshooterData> response = Response.FromValue(SelfHelpTroubleshooterData.FromResponse(result), result);
                 if (response.Value == null)
+                {
                     throw new RequestFailedException(response.GetRawResponse());
+                }
                 return Response.FromValue(new SelfHelpTroubleshooterResource(Client, response.Value), response.GetRawResponse());
             }
             catch (Exception e)
@@ -231,39 +247,53 @@ public virtual Response<SelfHelpTroubleshooterResource> Get(string troubleshoote
         }
 
         /// <summary>
-        /// Checks to see if the resource exists in azure.
+        /// Gets troubleshooter instance result which includes the step status/result of the troubleshooter resource name that is being executed.&lt;br/&gt; Get API is used to retrieve the result of a Troubleshooter instance, which includes the status and result of each step in the Troubleshooter workflow. This API requires the Troubleshooter resource name that was created using the Create API.
         /// <list type="bullet">
         /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/troubleshooters/{troubleshooterName}</description>
-        /// </item>
-        /// <item>
-        /// <term>Operation Id</term>
-        /// <description>TroubleshooterResource_Get</description>
+        /// <term> Request Path. </term>
+        /// <description> /{scope}/providers/Microsoft.Help/troubleshooters/{troubleshooterName}. </description>
         /// </item>
         /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
+        /// <term> Operation Id. </term>
+        /// <description> TroubleshooterResources_Get. </description>
         /// </item>
         /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpTroubleshooterResource"/></description>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="troubleshooterName"> Troubleshooter resource Name. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentException"> <paramref name="troubleshooterName"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="ArgumentNullException"> <paramref name="troubleshooterName"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="troubleshooterName"/> is an empty string, and was expected to be non-empty. </exception>
         public virtual async Task<Response<bool>> ExistsAsync(string troubleshooterName, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(troubleshooterName, nameof(troubleshooterName));
 
-            using var scope = _selfHelpTroubleshooterTroubleshooterResourcesClientDiagnostics.CreateScope("SelfHelpTroubleshooterCollection.Exists");
+            using DiagnosticScope scope = _troubleshooterResourcesClientDiagnostics.CreateScope("SelfHelpTroubleshooterCollection.Exists");
             scope.Start();
             try
             {
-                var response = await _selfHelpTroubleshooterTroubleshooterResourcesRestClient.GetAsync(Id, troubleshooterName, cancellationToken: cancellationToken).ConfigureAwait(false);
+                RequestContext context = new RequestContext
+                {
+                    CancellationToken = cancellationToken
+                };
+                HttpMessage message = _troubleshooterResourcesRestClient.CreateGetRequest(Id, troubleshooterName, context);
+                await Pipeline.SendAsync(message, context.CancellationToken).ConfigureAwait(false);
+                Response result = message.Response;
+                Response<SelfHelpTroubleshooterData> response = default;
+                switch (result.Status)
+                {
+                    case 200:
+                        response = Response.FromValue(SelfHelpTroubleshooterData.FromResponse(result), result);
+                        break;
+                    case 404:
+                        response = Response.FromValue((SelfHelpTroubleshooterData)null, result);
+                        break;
+                    default:
+                        throw new RequestFailedException(result);
+                }
                 return Response.FromValue(response.Value != null, response.GetRawResponse());
             }
             catch (Exception e)
@@ -274,39 +304,53 @@ public virtual async Task<Response<bool>> ExistsAsync(string troubleshooterName,
         }
 
         /// <summary>
-        /// Checks to see if the resource exists in azure.
+        /// Gets troubleshooter instance result which includes the step status/result of the troubleshooter resource name that is being executed.&lt;br/&gt; Get API is used to retrieve the result of a Troubleshooter instance, which includes the status and result of each step in the Troubleshooter workflow. This API requires the Troubleshooter resource name that was created using the Create API.
         /// <list type="bullet">
         /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/troubleshooters/{troubleshooterName}</description>
-        /// </item>
-        /// <item>
-        /// <term>Operation Id</term>
-        /// <description>TroubleshooterResource_Get</description>
+        /// <term> Request Path. </term>
+        /// <description> /{scope}/providers/Microsoft.Help/troubleshooters/{troubleshooterName}. </description>
         /// </item>
         /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
+        /// <term> Operation Id. </term>
+        /// <description> TroubleshooterResources_Get. </description>
         /// </item>
         /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpTroubleshooterResource"/></description>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="troubleshooterName"> Troubleshooter resource Name. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentException"> <paramref name="troubleshooterName"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="ArgumentNullException"> <paramref name="troubleshooterName"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="troubleshooterName"/> is an empty string, and was expected to be non-empty. </exception>
         public virtual Response<bool> Exists(string troubleshooterName, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(troubleshooterName, nameof(troubleshooterName));
 
-            using var scope = _selfHelpTroubleshooterTroubleshooterResourcesClientDiagnostics.CreateScope("SelfHelpTroubleshooterCollection.Exists");
+            using DiagnosticScope scope = _troubleshooterResourcesClientDiagnostics.CreateScope("SelfHelpTroubleshooterCollection.Exists");
             scope.Start();
             try
             {
-                var response = _selfHelpTroubleshooterTroubleshooterResourcesRestClient.Get(Id, troubleshooterName, cancellationToken: cancellationToken);
+                RequestContext context = new RequestContext
+                {
+                    CancellationToken = cancellationToken
+                };
+                HttpMessage message = _troubleshooterResourcesRestClient.CreateGetRequest(Id, troubleshooterName, context);
+                Pipeline.Send(message, context.CancellationToken);
+                Response result = message.Response;
+                Response<SelfHelpTroubleshooterData> response = default;
+                switch (result.Status)
+                {
+                    case 200:
+                        response = Response.FromValue(SelfHelpTroubleshooterData.FromResponse(result), result);
+                        break;
+                    case 404:
+                        response = Response.FromValue((SelfHelpTroubleshooterData)null, result);
+                        break;
+                    default:
+                        throw new RequestFailedException(result);
+                }
                 return Response.FromValue(response.Value != null, response.GetRawResponse());
             }
             catch (Exception e)
@@ -317,41 +361,57 @@ public virtual Response<bool> Exists(string troubleshooterName, CancellationToke
         }
 
         /// <summary>
-        /// Tries to get details for this resource from the service.
+        /// Gets troubleshooter instance result which includes the step status/result of the troubleshooter resource name that is being executed.&lt;br/&gt; Get API is used to retrieve the result of a Troubleshooter instance, which includes the status and result of each step in the Troubleshooter workflow. This API requires the Troubleshooter resource name that was created using the Create API.
         /// <list type="bullet">
         /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/troubleshooters/{troubleshooterName}</description>
+        /// <term> Request Path. </term>
+        /// <description> /{scope}/providers/Microsoft.Help/troubleshooters/{troubleshooterName}. </description>
         /// </item>
         /// <item>
-        /// <term>Operation Id</term>
-        /// <description>TroubleshooterResource_Get</description>
+        /// <term> Operation Id. </term>
+        /// <description> TroubleshooterResources_Get. </description>
         /// </item>
         /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
-        /// </item>
-        /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpTroubleshooterResource"/></description>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="troubleshooterName"> Troubleshooter resource Name. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentException"> <paramref name="troubleshooterName"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="ArgumentNullException"> <paramref name="troubleshooterName"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="troubleshooterName"/> is an empty string, and was expected to be non-empty. </exception>
         public virtual async Task<NullableResponse<SelfHelpTroubleshooterResource>> GetIfExistsAsync(string troubleshooterName, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(troubleshooterName, nameof(troubleshooterName));
 
-            using var scope = _selfHelpTroubleshooterTroubleshooterResourcesClientDiagnostics.CreateScope("SelfHelpTroubleshooterCollection.GetIfExists");
+            using DiagnosticScope scope = _troubleshooterResourcesClientDiagnostics.CreateScope("SelfHelpTroubleshooterCollection.GetIfExists");
             scope.Start();
             try
             {
-                var response = await _selfHelpTroubleshooterTroubleshooterResourcesRestClient.GetAsync(Id, troubleshooterName, cancellationToken: cancellationToken).ConfigureAwait(false);
+                RequestContext context = new RequestContext
+                {
+                    CancellationToken = cancellationToken
+                };
+                HttpMessage message = _troubleshooterResourcesRestClient.CreateGetRequest(Id, troubleshooterName, context);
+                await Pipeline.SendAsync(message, context.CancellationToken).ConfigureAwait(false);
+                Response result = message.Response;
+                Response<SelfHelpTroubleshooterData> response = default;
+                switch (result.Status)
+                {
+                    case 200:
+                        response = Response.FromValue(SelfHelpTroubleshooterData.FromResponse(result), result);
+                        break;
+                    case 404:
+                        response = Response.FromValue((SelfHelpTroubleshooterData)null, result);
+                        break;
+                    default:
+                        throw new RequestFailedException(result);
+                }
                 if (response.Value == null)
+                {
                     return new NoValueResponse<SelfHelpTroubleshooterResource>(response.GetRawResponse());
+                }
                 return Response.FromValue(new SelfHelpTroubleshooterResource(Client, response.Value), response.GetRawResponse());
             }
             catch (Exception e)
@@ -362,41 +422,57 @@ public virtual async Task<NullableResponse<SelfHelpTroubleshooterResource>> GetI
         }
 
         /// <summary>
-        /// Tries to get details for this resource from the service.
+        /// Gets troubleshooter instance result which includes the step status/result of the troubleshooter resource name that is being executed.&lt;br/&gt; Get API is used to retrieve the result of a Troubleshooter instance, which includes the status and result of each step in the Troubleshooter workflow. This API requires the Troubleshooter resource name that was created using the Create API.
         /// <list type="bullet">
         /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/troubleshooters/{troubleshooterName}</description>
+        /// <term> Request Path. </term>
+        /// <description> /{scope}/providers/Microsoft.Help/troubleshooters/{troubleshooterName}. </description>
         /// </item>
         /// <item>
-        /// <term>Operation Id</term>
-        /// <description>TroubleshooterResource_Get</description>
+        /// <term> Operation Id. </term>
+        /// <description> TroubleshooterResources_Get. </description>
         /// </item>
         /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
-        /// </item>
-        /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpTroubleshooterResource"/></description>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="troubleshooterName"> Troubleshooter resource Name. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentException"> <paramref name="troubleshooterName"/> is an empty string, and was expected to be non-empty. </exception>
         /// <exception cref="ArgumentNullException"> <paramref name="troubleshooterName"/> is null. </exception>
+        /// <exception cref="ArgumentException"> <paramref name="troubleshooterName"/> is an empty string, and was expected to be non-empty. </exception>
         public virtual NullableResponse<SelfHelpTroubleshooterResource> GetIfExists(string troubleshooterName, CancellationToken cancellationToken = default)
         {
             Argument.AssertNotNullOrEmpty(troubleshooterName, nameof(troubleshooterName));
 
-            using var scope = _selfHelpTroubleshooterTroubleshooterResourcesClientDiagnostics.CreateScope("SelfHelpTroubleshooterCollection.GetIfExists");
+            using DiagnosticScope scope = _troubleshooterResourcesClientDiagnostics.CreateScope("SelfHelpTroubleshooterCollection.GetIfExists");
             scope.Start();
             try
             {
-                var response = _selfHelpTroubleshooterTroubleshooterResourcesRestClient.Get(Id, troubleshooterName, cancellationToken: cancellationToken);
+                RequestContext context = new RequestContext
+                {
+                    CancellationToken = cancellationToken
+                };
+                HttpMessage message = _troubleshooterResourcesRestClient.CreateGetRequest(Id, troubleshooterName, context);
+                Pipeline.Send(message, context.CancellationToken);
+                Response result = message.Response;
+                Response<SelfHelpTroubleshooterData> response = default;
+                switch (result.Status)
+                {
+                    case 200:
+                        response = Response.FromValue(SelfHelpTroubleshooterData.FromResponse(result), result);
+                        break;
+                    case 404:
+                        response = Response.FromValue((SelfHelpTroubleshooterData)null, result);
+                        break;
+                    default:
+                        throw new RequestFailedException(result);
+                }
                 if (response.Value == null)
+                {
                     return new NoValueResponse<SelfHelpTroubleshooterResource>(response.GetRawResponse());
+                }
                 return Response.FromValue(new SelfHelpTroubleshooterResource(Client, response.Value), response.GetRawResponse());
             }
             catch (Exception e)
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpTroubleshooterData.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpTroubleshooterData.Serialization.cs
index 46647ddd920f..5e2f1862e857 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpTroubleshooterData.Serialization.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpTroubleshooterData.Serialization.cs
@@ -10,16 +10,18 @@
 using System.Collections.Generic;
 using System.Text;
 using System.Text.Json;
+using Azure;
 using Azure.Core;
 using Azure.ResourceManager.Models;
 using Azure.ResourceManager.SelfHelp.Models;
 
 namespace Azure.ResourceManager.SelfHelp
 {
-    public partial class SelfHelpTroubleshooterData : IUtf8JsonSerializable, IJsonModel<SelfHelpTroubleshooterData>
+    /// <summary> Troubleshooter response. </summary>
+    public partial class SelfHelpTroubleshooterData : ResourceData, IJsonModel<SelfHelpTroubleshooterData>
     {
-        void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) => ((IJsonModel<SelfHelpTroubleshooterData>)this).Write(writer, ModelSerializationExtensions.WireOptions);
-
+        /// <param name="writer"> The JSON writer. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
         void IJsonModel<SelfHelpTroubleshooterData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
@@ -31,181 +33,114 @@ void IJsonModel<SelfHelpTroubleshooterData>.Write(Utf8JsonWriter writer, ModelRe
         /// <param name="options"> The client options for reading and writing models. </param>
         protected override void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpTroubleshooterData>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpTroubleshooterData>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(SelfHelpTroubleshooterData)} does not support writing '{format}' format.");
             }
-
             base.JsonModelWriteCore(writer, options);
-            writer.WritePropertyName("properties"u8);
-            writer.WriteStartObject();
-            if (Optional.IsDefined(SolutionId))
-            {
-                writer.WritePropertyName("solutionId"u8);
-                writer.WriteStringValue(SolutionId);
-            }
-            if (Optional.IsCollectionDefined(Parameters))
-            {
-                writer.WritePropertyName("parameters"u8);
-                writer.WriteStartObject();
-                foreach (var item in Parameters)
-                {
-                    writer.WritePropertyName(item.Key);
-                    writer.WriteStringValue(item.Value);
-                }
-                writer.WriteEndObject();
-            }
-            if (options.Format != "W" && Optional.IsDefined(ProvisioningState))
-            {
-                writer.WritePropertyName("provisioningState"u8);
-                writer.WriteStringValue(ProvisioningState.Value.ToString());
-            }
-            if (options.Format != "W" && Optional.IsCollectionDefined(Steps))
+            if (Optional.IsDefined(Properties))
             {
-                writer.WritePropertyName("steps"u8);
-                writer.WriteStartArray();
-                foreach (var item in Steps)
-                {
-                    writer.WriteObjectValue(item, options);
-                }
-                writer.WriteEndArray();
+                writer.WritePropertyName("properties"u8);
+                writer.WriteObjectValue(Properties, options);
             }
-            writer.WriteEndObject();
         }
 
-        SelfHelpTroubleshooterData IJsonModel<SelfHelpTroubleshooterData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        SelfHelpTroubleshooterData IJsonModel<SelfHelpTroubleshooterData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => (SelfHelpTroubleshooterData)JsonModelCreateCore(ref reader, options);
+
+        /// <param name="reader"> The JSON reader. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual ResourceData JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpTroubleshooterData>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpTroubleshooterData>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(SelfHelpTroubleshooterData)} does not support reading '{format}' format.");
             }
-
             using JsonDocument document = JsonDocument.ParseValue(ref reader);
             return DeserializeSelfHelpTroubleshooterData(document.RootElement, options);
         }
 
-        internal static SelfHelpTroubleshooterData DeserializeSelfHelpTroubleshooterData(JsonElement element, ModelReaderWriterOptions options = null)
+        /// <param name="element"> The JSON element to deserialize. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        internal static SelfHelpTroubleshooterData DeserializeSelfHelpTroubleshooterData(JsonElement element, ModelReaderWriterOptions options)
         {
-            options ??= ModelSerializationExtensions.WireOptions;
-
             if (element.ValueKind == JsonValueKind.Null)
             {
                 return null;
             }
             ResourceIdentifier id = default;
             string name = default;
-            ResourceType type = default;
+            ResourceType resourceType = default;
             SystemData systemData = default;
-            string solutionId = default;
-            IDictionary<string, string> parameters = default;
-            TroubleshooterProvisioningState? provisioningState = default;
-            IReadOnlyList<SelfHelpStep> steps = default;
-            IDictionary<string, BinaryData> serializedAdditionalRawData = default;
-            Dictionary<string, BinaryData> rawDataDictionary = new Dictionary<string, BinaryData>();
-            foreach (var property in element.EnumerateObject())
+            IDictionary<string, BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            TroubleshooterInstanceProperties properties = default;
+            foreach (var prop in element.EnumerateObject())
             {
-                if (property.NameEquals("id"u8))
+                if (prop.NameEquals("id"u8))
                 {
-                    id = new ResourceIdentifier(property.Value.GetString());
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    id = new ResourceIdentifier(prop.Value.GetString());
                     continue;
                 }
-                if (property.NameEquals("name"u8))
+                if (prop.NameEquals("name"u8))
                 {
-                    name = property.Value.GetString();
+                    name = prop.Value.GetString();
                     continue;
                 }
-                if (property.NameEquals("type"u8))
+                if (prop.NameEquals("type"u8))
                 {
-                    type = new ResourceType(property.Value.GetString());
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
+                    {
+                        continue;
+                    }
+                    resourceType = new ResourceType(prop.Value.GetString());
                     continue;
                 }
-                if (property.NameEquals("systemData"u8))
+                if (prop.NameEquals("systemData"u8))
                 {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
-                    systemData = ModelReaderWriter.Read<SystemData>(new BinaryData(Encoding.UTF8.GetBytes(property.Value.GetRawText())), ModelSerializationExtensions.WireOptions, AzureResourceManagerSelfHelpContext.Default);
+                    systemData = ModelReaderWriter.Read<SystemData>(new BinaryData(Encoding.UTF8.GetBytes(prop.Value.GetRawText())), ModelSerializationExtensions.WireOptions, AzureResourceManagerSelfHelpContext.Default);
                     continue;
                 }
-                if (property.NameEquals("properties"u8))
+                if (prop.NameEquals("properties"u8))
                 {
-                    if (property.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
-                        property.ThrowNonNullablePropertyIsNull();
                         continue;
                     }
-                    foreach (var property0 in property.Value.EnumerateObject())
-                    {
-                        if (property0.NameEquals("solutionId"u8))
-                        {
-                            solutionId = property0.Value.GetString();
-                            continue;
-                        }
-                        if (property0.NameEquals("parameters"u8))
-                        {
-                            if (property0.Value.ValueKind == JsonValueKind.Null)
-                            {
-                                continue;
-                            }
-                            Dictionary<string, string> dictionary = new Dictionary<string, string>();
-                            foreach (var property1 in property0.Value.EnumerateObject())
-                            {
-                                dictionary.Add(property1.Name, property1.Value.GetString());
-                            }
-                            parameters = dictionary;
-                            continue;
-                        }
-                        if (property0.NameEquals("provisioningState"u8))
-                        {
-                            if (property0.Value.ValueKind == JsonValueKind.Null)
-                            {
-                                continue;
-                            }
-                            provisioningState = new TroubleshooterProvisioningState(property0.Value.GetString());
-                            continue;
-                        }
-                        if (property0.NameEquals("steps"u8))
-                        {
-                            if (property0.Value.ValueKind == JsonValueKind.Null)
-                            {
-                                continue;
-                            }
-                            List<SelfHelpStep> array = new List<SelfHelpStep>();
-                            foreach (var item in property0.Value.EnumerateArray())
-                            {
-                                array.Add(SelfHelpStep.DeserializeSelfHelpStep(item, options));
-                            }
-                            steps = array;
-                            continue;
-                        }
-                    }
+                    properties = TroubleshooterInstanceProperties.DeserializeTroubleshooterInstanceProperties(prop.Value, options);
                     continue;
                 }
                 if (options.Format != "W")
                 {
-                    rawDataDictionary.Add(property.Name, BinaryData.FromString(property.Value.GetRawText()));
+                    additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText()));
                 }
             }
-            serializedAdditionalRawData = rawDataDictionary;
             return new SelfHelpTroubleshooterData(
                 id,
                 name,
-                type,
+                resourceType,
                 systemData,
-                solutionId,
-                parameters ?? new ChangeTrackingDictionary<string, string>(),
-                provisioningState,
-                steps ?? new ChangeTrackingList<SelfHelpStep>(),
-                serializedAdditionalRawData);
+                additionalBinaryDataProperties,
+                properties);
         }
 
-        BinaryData IPersistableModel<SelfHelpTroubleshooterData>.Write(ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpTroubleshooterData>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="options"> The client options for reading and writing models. </param>
+        BinaryData IPersistableModel<SelfHelpTroubleshooterData>.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
 
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpTroubleshooterData>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
@@ -215,15 +150,20 @@ BinaryData IPersistableModel<SelfHelpTroubleshooterData>.Write(ModelReaderWriter
             }
         }
 
-        SelfHelpTroubleshooterData IPersistableModel<SelfHelpTroubleshooterData>.Create(BinaryData data, ModelReaderWriterOptions options)
-        {
-            var format = options.Format == "W" ? ((IPersistableModel<SelfHelpTroubleshooterData>)this).GetFormatFromOptions(options) : options.Format;
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        SelfHelpTroubleshooterData IPersistableModel<SelfHelpTroubleshooterData>.Create(BinaryData data, ModelReaderWriterOptions options) => (SelfHelpTroubleshooterData)PersistableModelCreateCore(data, options);
 
+        /// <param name="data"> The data to parse. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        protected virtual ResourceData PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options)
+        {
+            string format = options.Format == "W" ? ((IPersistableModel<SelfHelpTroubleshooterData>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
+                    using (JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions))
                     {
-                        using JsonDocument document = JsonDocument.Parse(data, ModelSerializationExtensions.JsonDocumentOptions);
                         return DeserializeSelfHelpTroubleshooterData(document.RootElement, options);
                     }
                 default:
@@ -231,6 +171,26 @@ SelfHelpTroubleshooterData IPersistableModel<SelfHelpTroubleshooterData>.Create(
             }
         }
 
+        /// <param name="options"> The client options for reading and writing models. </param>
         string IPersistableModel<SelfHelpTroubleshooterData>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+
+        /// <param name="selfHelpTroubleshooterData"> The <see cref="SelfHelpTroubleshooterData"/> to serialize into <see cref="RequestContent"/>. </param>
+        internal static RequestContent ToRequestContent(SelfHelpTroubleshooterData selfHelpTroubleshooterData)
+        {
+            if (selfHelpTroubleshooterData == null)
+            {
+                return null;
+            }
+            Utf8JsonRequestContent content = new Utf8JsonRequestContent();
+            content.JsonWriter.WriteObjectValue(selfHelpTroubleshooterData, ModelSerializationExtensions.WireOptions);
+            return content;
+        }
+
+        /// <param name="response"> The <see cref="Response"/> to deserialize the <see cref="SelfHelpTroubleshooterData"/> from. </param>
+        internal static SelfHelpTroubleshooterData FromResponse(Response response)
+        {
+            using JsonDocument document = JsonDocument.Parse(response.Content, ModelSerializationExtensions.JsonDocumentOptions);
+            return DeserializeSelfHelpTroubleshooterData(document.RootElement, ModelSerializationExtensions.WireOptions);
+        }
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpTroubleshooterData.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpTroubleshooterData.cs
index f0d1d4d9bb5c..a3d20fc08cdd 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpTroubleshooterData.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpTroubleshooterData.cs
@@ -13,77 +13,83 @@
 
 namespace Azure.ResourceManager.SelfHelp
 {
-    /// <summary>
-    /// A class representing the SelfHelpTroubleshooter data model.
-    /// Troubleshooter response.
-    /// </summary>
+    /// <summary> Troubleshooter response. </summary>
     public partial class SelfHelpTroubleshooterData : ResourceData
     {
-        /// <summary>
-        /// Keeps track of any properties unknown to the library.
-        /// <para>
-        /// To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, System.Text.Json.JsonSerializerOptions?)"/>.
-        /// </para>
-        /// <para>
-        /// To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>.
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson("foo")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("\"foo\"")</term>
-        /// <description>Creates a payload of "foo".</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromObjectAsJson(new { key = "value" })</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// <item>
-        /// <term>BinaryData.FromString("{\"key\": \"value\"}")</term>
-        /// <description>Creates a payload of { "key": "value" }.</description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        private IDictionary<string, BinaryData> _serializedAdditionalRawData;
+        /// <summary> Keeps track of any properties unknown to the library. </summary>
+        private protected readonly IDictionary<string, BinaryData> _additionalBinaryDataProperties;
 
         /// <summary> Initializes a new instance of <see cref="SelfHelpTroubleshooterData"/>. </summary>
         public SelfHelpTroubleshooterData()
         {
-            Parameters = new ChangeTrackingDictionary<string, string>();
-            Steps = new ChangeTrackingList<SelfHelpStep>();
         }
 
         /// <summary> Initializes a new instance of <see cref="SelfHelpTroubleshooterData"/>. </summary>
-        /// <param name="id"> The id. </param>
-        /// <param name="name"> The name. </param>
-        /// <param name="resourceType"> The resourceType. </param>
-        /// <param name="systemData"> The systemData. </param>
-        /// <param name="solutionId"> Solution Id to identify single troubleshooter. </param>
-        /// <param name="parameters"> Client input parameters to run Troubleshooter Resource. </param>
-        /// <param name="provisioningState"> Status of troubleshooter provisioning. </param>
-        /// <param name="steps"> List of step object. </param>
-        /// <param name="serializedAdditionalRawData"> Keeps track of any properties unknown to the library. </param>
-        internal SelfHelpTroubleshooterData(ResourceIdentifier id, string name, ResourceType resourceType, SystemData systemData, string solutionId, IDictionary<string, string> parameters, TroubleshooterProvisioningState? provisioningState, IReadOnlyList<SelfHelpStep> steps, IDictionary<string, BinaryData> serializedAdditionalRawData) : base(id, name, resourceType, systemData)
+        /// <param name="id"> Fully qualified resource ID for the resource. Ex - /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}. </param>
+        /// <param name="name"> The name of the resource. </param>
+        /// <param name="resourceType"> The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or "Microsoft.Storage/storageAccounts". </param>
+        /// <param name="systemData"> Azure Resource Manager metadata containing createdBy and modifiedBy information. </param>
+        /// <param name="additionalBinaryDataProperties"> Keeps track of any properties unknown to the library. </param>
+        /// <param name="properties"> Troubleshooter Instance properties. </param>
+        internal SelfHelpTroubleshooterData(ResourceIdentifier id, string name, ResourceType resourceType, SystemData systemData, IDictionary<string, BinaryData> additionalBinaryDataProperties, TroubleshooterInstanceProperties properties) : base(id, name, resourceType, systemData)
         {
-            SolutionId = solutionId;
-            Parameters = parameters;
-            ProvisioningState = provisioningState;
-            Steps = steps;
-            _serializedAdditionalRawData = serializedAdditionalRawData;
+            _additionalBinaryDataProperties = additionalBinaryDataProperties;
+            Properties = properties;
         }
 
+        /// <summary> Troubleshooter Instance properties. </summary>
+        internal TroubleshooterInstanceProperties Properties { get; set; }
+
         /// <summary> Solution Id to identify single troubleshooter. </summary>
-        public string SolutionId { get; set; }
+        public string SolutionId
+        {
+            get
+            {
+                return Properties is null ? default : Properties.SolutionId;
+            }
+            set
+            {
+                if (Properties is null)
+                {
+                    Properties = new TroubleshooterInstanceProperties();
+                }
+                Properties.SolutionId = value;
+            }
+        }
+
         /// <summary> Client input parameters to run Troubleshooter Resource. </summary>
-        public IDictionary<string, string> Parameters { get; }
+        public IDictionary<string, string> Parameters
+        {
+            get
+            {
+                if (Properties is null)
+                {
+                    Properties = new TroubleshooterInstanceProperties();
+                }
+                return Properties.Parameters;
+            }
+        }
+
         /// <summary> Status of troubleshooter provisioning. </summary>
-        public TroubleshooterProvisioningState? ProvisioningState { get; }
+        public TroubleshooterProvisioningState? ProvisioningState
+        {
+            get
+            {
+                return Properties is null ? default : Properties.ProvisioningState;
+            }
+        }
+
         /// <summary> List of step object. </summary>
-        public IReadOnlyList<SelfHelpStep> Steps { get; }
+        public IReadOnlyList<SelfHelpStep> Steps
+        {
+            get
+            {
+                if (Properties is null)
+                {
+                    Properties = new TroubleshooterInstanceProperties();
+                }
+                return Properties.Steps;
+            }
+        }
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpTroubleshooterResource.Serialization.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpTroubleshooterResource.Serialization.cs
index 2f06180a7368..9b9351d9c14d 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpTroubleshooterResource.Serialization.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpTroubleshooterResource.Serialization.cs
@@ -11,19 +11,29 @@
 
 namespace Azure.ResourceManager.SelfHelp
 {
+    /// <summary></summary>
     public partial class SelfHelpTroubleshooterResource : IJsonModel<SelfHelpTroubleshooterData>
     {
-        private static SelfHelpTroubleshooterData s_dataDeserializationInstance;
-        private static SelfHelpTroubleshooterData DataDeserializationInstance => s_dataDeserializationInstance ??= new();
+        private static IJsonModel<SelfHelpTroubleshooterData> s_dataDeserializationInstance;
 
+        private static IJsonModel<SelfHelpTroubleshooterData> DataDeserializationInstance => s_dataDeserializationInstance ??= new SelfHelpTroubleshooterData();
+
+        /// <param name="writer"> The writer to serialize the model to. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
         void IJsonModel<SelfHelpTroubleshooterData>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options) => ((IJsonModel<SelfHelpTroubleshooterData>)Data).Write(writer, options);
 
-        SelfHelpTroubleshooterData IJsonModel<SelfHelpTroubleshooterData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => ((IJsonModel<SelfHelpTroubleshooterData>)DataDeserializationInstance).Create(ref reader, options);
+        /// <param name="reader"> The reader for deserializing the model. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
+        SelfHelpTroubleshooterData IJsonModel<SelfHelpTroubleshooterData>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => DataDeserializationInstance.Create(ref reader, options);
 
+        /// <param name="options"> The client options for reading and writing models. </param>
         BinaryData IPersistableModel<SelfHelpTroubleshooterData>.Write(ModelReaderWriterOptions options) => ModelReaderWriter.Write<SelfHelpTroubleshooterData>(Data, options, AzureResourceManagerSelfHelpContext.Default);
 
+        /// <param name="data"> The binary data to be processed. </param>
+        /// <param name="options"> The client options for reading and writing models. </param>
         SelfHelpTroubleshooterData IPersistableModel<SelfHelpTroubleshooterData>.Create(BinaryData data, ModelReaderWriterOptions options) => ModelReaderWriter.Read<SelfHelpTroubleshooterData>(data, options, AzureResourceManagerSelfHelpContext.Default);
 
-        string IPersistableModel<SelfHelpTroubleshooterData>.GetFormatFromOptions(ModelReaderWriterOptions options) => ((IPersistableModel<SelfHelpTroubleshooterData>)DataDeserializationInstance).GetFormatFromOptions(options);
+        /// <param name="options"> The client options for reading and writing models. </param>
+        string IPersistableModel<SelfHelpTroubleshooterData>.GetFormatFromOptions(ModelReaderWriterOptions options) => DataDeserializationInstance.GetFormatFromOptions(options);
     }
 }
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpTroubleshooterResource.cs b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpTroubleshooterResource.cs
index 8ab1b3f6db36..31f324790eec 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpTroubleshooterResource.cs
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/src/Generated/SelfHelpTroubleshooterResource.cs
@@ -6,45 +6,36 @@
 #nullable disable
 
 using System;
-using System.Globalization;
+using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
+using Azure;
 using Azure.Core;
 using Azure.Core.Pipeline;
+using Azure.ResourceManager;
 using Azure.ResourceManager.SelfHelp.Models;
 
 namespace Azure.ResourceManager.SelfHelp
 {
     /// <summary>
-    /// A Class representing a SelfHelpTroubleshooter along with the instance operations that can be performed on it.
-    /// If you have a <see cref="ResourceIdentifier"/> you can construct a <see cref="SelfHelpTroubleshooterResource"/>
-    /// from an instance of <see cref="ArmClient"/> using the GetSelfHelpTroubleshooterResource method.
-    /// Otherwise you can get one from its parent resource <see cref="ArmResource"/> using the GetSelfHelpTroubleshooter method.
+    /// A class representing a SelfHelpTroubleshooter along with the instance operations that can be performed on it.
+    /// If you have a <see cref="ResourceIdentifier"/> you can construct a <see cref="SelfHelpTroubleshooterResource"/> from an instance of <see cref="ArmClient"/> using the GetResource method.
+    /// Otherwise you can get one from its parent resource <see cref="ArmResource"/> using the GetSelfHelpTroubleshooters method.
     /// </summary>
     public partial class SelfHelpTroubleshooterResource : ArmResource
     {
-        /// <summary> Generate the resource identifier of a <see cref="SelfHelpTroubleshooterResource"/> instance. </summary>
-        /// <param name="scope"> The scope. </param>
-        /// <param name="troubleshooterName"> The troubleshooterName. </param>
-        public static ResourceIdentifier CreateResourceIdentifier(string scope, string troubleshooterName)
-        {
-            var resourceId = $"{scope}/providers/Microsoft.Help/troubleshooters/{troubleshooterName}";
-            return new ResourceIdentifier(resourceId);
-        }
-
-        private readonly ClientDiagnostics _selfHelpTroubleshooterTroubleshooterResourcesClientDiagnostics;
-        private readonly TroubleshooterResourcesRestOperations _selfHelpTroubleshooterTroubleshooterResourcesRestClient;
+        private readonly ClientDiagnostics _troubleshooterResourcesClientDiagnostics;
+        private readonly TroubleshooterResources _troubleshooterResourcesRestClient;
         private readonly SelfHelpTroubleshooterData _data;
-
         /// <summary> Gets the resource type for the operations. </summary>
         public static readonly ResourceType ResourceType = "Microsoft.Help/troubleshooters";
 
-        /// <summary> Initializes a new instance of the <see cref="SelfHelpTroubleshooterResource"/> class for mocking. </summary>
+        /// <summary> Initializes a new instance of SelfHelpTroubleshooterResource for mocking. </summary>
         protected SelfHelpTroubleshooterResource()
         {
         }
 
-        /// <summary> Initializes a new instance of the <see cref="SelfHelpTroubleshooterResource"/> class. </summary>
+        /// <summary> Initializes a new instance of <see cref="SelfHelpTroubleshooterResource"/> class. </summary>
         /// <param name="client"> The client parameters to use in these operations. </param>
         /// <param name="data"> The resource that is the target of operations. </param>
         internal SelfHelpTroubleshooterResource(ArmClient client, SelfHelpTroubleshooterData data) : this(client, data.Id)
@@ -53,71 +44,91 @@ internal SelfHelpTroubleshooterResource(ArmClient client, SelfHelpTroubleshooter
             _data = data;
         }
 
-        /// <summary> Initializes a new instance of the <see cref="SelfHelpTroubleshooterResource"/> class. </summary>
+        /// <summary> Initializes a new instance of <see cref="SelfHelpTroubleshooterResource"/> class. </summary>
         /// <param name="client"> The client parameters to use in these operations. </param>
         /// <param name="id"> The identifier of the resource that is the target of operations. </param>
         internal SelfHelpTroubleshooterResource(ArmClient client, ResourceIdentifier id) : base(client, id)
         {
-            _selfHelpTroubleshooterTroubleshooterResourcesClientDiagnostics = new ClientDiagnostics("Azure.ResourceManager.SelfHelp", ResourceType.Namespace, Diagnostics);
-            TryGetApiVersion(ResourceType, out string selfHelpTroubleshooterTroubleshooterResourcesApiVersion);
-            _selfHelpTroubleshooterTroubleshooterResourcesRestClient = new TroubleshooterResourcesRestOperations(Pipeline, Diagnostics.ApplicationId, Endpoint, selfHelpTroubleshooterTroubleshooterResourcesApiVersion);
-#if DEBUG
-			ValidateResourceId(Id);
-#endif
+            TryGetApiVersion(ResourceType, out string selfHelpTroubleshooterApiVersion);
+            _troubleshooterResourcesClientDiagnostics = new ClientDiagnostics("Azure.ResourceManager.SelfHelp", ResourceType.Namespace, Diagnostics);
+            _troubleshooterResourcesRestClient = new TroubleshooterResources(_troubleshooterResourcesClientDiagnostics, Pipeline, Endpoint, selfHelpTroubleshooterApiVersion ?? "2024-03-01-preview");
+            ValidateResourceId(id);
         }
 
         /// <summary> Gets whether or not the current instance has data. </summary>
         public virtual bool HasData { get; }
 
         /// <summary> Gets the data representing this Feature. </summary>
-        /// <exception cref="InvalidOperationException"> Throws if there is no data loaded in the current instance. </exception>
         public virtual SelfHelpTroubleshooterData Data
         {
             get
             {
                 if (!HasData)
+                {
                     throw new InvalidOperationException("The current instance does not have data, you must call Get first.");
+                }
                 return _data;
             }
         }
 
+        /// <summary> Generate the resource identifier for this resource. </summary>
+        /// <param name="scope"> The scope. </param>
+        /// <param name="troubleshooterName"> The troubleshooterName. </param>
+        public static ResourceIdentifier CreateResourceIdentifier(string scope, string troubleshooterName)
+        {
+            string resourceId = $"{scope}/providers/Microsoft.Help/troubleshooters/{troubleshooterName}";
+            return new ResourceIdentifier(resourceId);
+        }
+
+        /// <param name="id"></param>
+        [Conditional("DEBUG")]
         internal static void ValidateResourceId(ResourceIdentifier id)
         {
             if (id.ResourceType != ResourceType)
-                throw new ArgumentException(string.Format(CultureInfo.CurrentCulture, "Invalid resource type {0} expected {1}", id.ResourceType, ResourceType), nameof(id));
+            {
+                throw new ArgumentException(string.Format("Invalid resource type {0} expected {1}", id.ResourceType, ResourceType), id);
+            }
         }
 
         /// <summary>
         /// Gets troubleshooter instance result which includes the step status/result of the troubleshooter resource name that is being executed.&lt;br/&gt; Get API is used to retrieve the result of a Troubleshooter instance, which includes the status and result of each step in the Troubleshooter workflow. This API requires the Troubleshooter resource name that was created using the Create API.
         /// <list type="bullet">
         /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/troubleshooters/{troubleshooterName}</description>
+        /// <term> Request Path. </term>
+        /// <description> /{scope}/providers/Microsoft.Help/troubleshooters/{troubleshooterName}. </description>
         /// </item>
         /// <item>
-        /// <term>Operation Id</term>
-        /// <description>TroubleshooterResource_Get</description>
+        /// <term> Operation Id. </term>
+        /// <description> TroubleshooterResources_Get. </description>
         /// </item>
         /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
         /// </item>
         /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpTroubleshooterResource"/></description>
+        /// <term> Resource. </term>
+        /// <description> <see cref="SelfHelpTroubleshooterResource"/>. </description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<SelfHelpTroubleshooterResource>> GetAsync(CancellationToken cancellationToken = default)
         {
-            using var scope = _selfHelpTroubleshooterTroubleshooterResourcesClientDiagnostics.CreateScope("SelfHelpTroubleshooterResource.Get");
+            using DiagnosticScope scope = _troubleshooterResourcesClientDiagnostics.CreateScope("SelfHelpTroubleshooterResource.Get");
             scope.Start();
             try
             {
-                var response = await _selfHelpTroubleshooterTroubleshooterResourcesRestClient.GetAsync(Id.Parent, Id.Name, cancellationToken).ConfigureAwait(false);
+                RequestContext context = new RequestContext
+                {
+                    CancellationToken = cancellationToken
+                };
+                HttpMessage message = _troubleshooterResourcesRestClient.CreateGetRequest(Id.Parent, Id.Name, context);
+                Response result = await Pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
+                Response<SelfHelpTroubleshooterData> response = Response.FromValue(SelfHelpTroubleshooterData.FromResponse(result), result);
                 if (response.Value == null)
+                {
                     throw new RequestFailedException(response.GetRawResponse());
+                }
                 return Response.FromValue(new SelfHelpTroubleshooterResource(Client, response.Value), response.GetRawResponse());
             }
             catch (Exception e)
@@ -131,33 +142,41 @@ public virtual async Task<Response<SelfHelpTroubleshooterResource>> GetAsync(Can
         /// Gets troubleshooter instance result which includes the step status/result of the troubleshooter resource name that is being executed.&lt;br/&gt; Get API is used to retrieve the result of a Troubleshooter instance, which includes the status and result of each step in the Troubleshooter workflow. This API requires the Troubleshooter resource name that was created using the Create API.
         /// <list type="bullet">
         /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/troubleshooters/{troubleshooterName}</description>
+        /// <term> Request Path. </term>
+        /// <description> /{scope}/providers/Microsoft.Help/troubleshooters/{troubleshooterName}. </description>
         /// </item>
         /// <item>
-        /// <term>Operation Id</term>
-        /// <description>TroubleshooterResource_Get</description>
+        /// <term> Operation Id. </term>
+        /// <description> TroubleshooterResources_Get. </description>
         /// </item>
         /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
         /// </item>
         /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpTroubleshooterResource"/></description>
+        /// <term> Resource. </term>
+        /// <description> <see cref="SelfHelpTroubleshooterResource"/>. </description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<SelfHelpTroubleshooterResource> Get(CancellationToken cancellationToken = default)
         {
-            using var scope = _selfHelpTroubleshooterTroubleshooterResourcesClientDiagnostics.CreateScope("SelfHelpTroubleshooterResource.Get");
+            using DiagnosticScope scope = _troubleshooterResourcesClientDiagnostics.CreateScope("SelfHelpTroubleshooterResource.Get");
             scope.Start();
             try
             {
-                var response = _selfHelpTroubleshooterTroubleshooterResourcesRestClient.Get(Id.Parent, Id.Name, cancellationToken);
+                RequestContext context = new RequestContext
+                {
+                    CancellationToken = cancellationToken
+                };
+                HttpMessage message = _troubleshooterResourcesRestClient.CreateGetRequest(Id.Parent, Id.Name, context);
+                Response result = Pipeline.ProcessMessage(message, context);
+                Response<SelfHelpTroubleshooterData> response = Response.FromValue(SelfHelpTroubleshooterData.FromResponse(result), result);
                 if (response.Value == null)
+                {
                     throw new RequestFailedException(response.GetRawResponse());
+                }
                 return Response.FromValue(new SelfHelpTroubleshooterResource(Client, response.Value), response.GetRawResponse());
             }
             catch (Exception e)
@@ -168,45 +187,41 @@ public virtual Response<SelfHelpTroubleshooterResource> Get(CancellationToken ca
         }
 
         /// <summary>
-        /// Creates the specific troubleshooter action under a resource or subscription using the ‘solutionId’ and  ‘properties.parameters’ as the trigger. &lt;br/&gt; Azure Troubleshooters help with hard to classify issues, reducing the gap between customer observed problems and solutions by guiding the user effortlessly through the troubleshooting process. Each Troubleshooter flow represents a problem area within Azure and has a complex tree-like structure that addresses many root causes. These flows are prepared with the help of Subject Matter experts and customer support engineers by carefully considering previous support requests raised by customers. Troubleshooters terminate at a well curated solution based off of resource backend signals and customer manual selections.
+        /// Uses ‘stepId’ and ‘responses’ as the trigger to continue the troubleshooting steps for the respective troubleshooter resource name. &lt;br/&gt;Continue API is used to provide inputs that are required for the specific troubleshooter to progress into the next step in the process. This API is used after the Troubleshooter has been created using the Create API.
         /// <list type="bullet">
         /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/troubleshooters/{troubleshooterName}</description>
+        /// <term> Request Path. </term>
+        /// <description> /{scope}/providers/Microsoft.Help/troubleshooters/{troubleshooterName}/continue. </description>
         /// </item>
         /// <item>
-        /// <term>Operation Id</term>
-        /// <description>TroubleshooterResource_Create</description>
+        /// <term> Operation Id. </term>
+        /// <description> TroubleshooterResources_Continue. </description>
         /// </item>
         /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
         /// </item>
         /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpTroubleshooterResource"/></description>
+        /// <term> Resource. </term>
+        /// <description> <see cref="SelfHelpTroubleshooterResource"/>. </description>
         /// </item>
         /// </list>
         /// </summary>
-        /// <param name="waitUntil"> <see cref="WaitUntil.Completed"/> if the method should wait to return until the long-running operation has completed on the service; <see cref="WaitUntil.Started"/> if it should return after starting the operation. For more information on long-running operations, please see <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/LongRunningOperations.md"> Azure.Core Long-Running Operation samples</see>. </param>
-        /// <param name="data"> The required request body for this Troubleshooter resource creation. </param>
+        /// <param name="continueRequestBody"> The required request body for going to next step in Troubleshooter resource. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="data"/> is null. </exception>
-        public virtual async Task<ArmOperation<SelfHelpTroubleshooterResource>> UpdateAsync(WaitUntil waitUntil, SelfHelpTroubleshooterData data, CancellationToken cancellationToken = default)
+        public virtual async Task<Response> ContinueAsync(TroubleshooterContinueContent continueRequestBody = default, CancellationToken cancellationToken = default)
         {
-            Argument.AssertNotNull(data, nameof(data));
-
-            using var scope = _selfHelpTroubleshooterTroubleshooterResourcesClientDiagnostics.CreateScope("SelfHelpTroubleshooterResource.Update");
+            using DiagnosticScope scope = _troubleshooterResourcesClientDiagnostics.CreateScope("SelfHelpTroubleshooterResource.Continue");
             scope.Start();
             try
             {
-                var response = await _selfHelpTroubleshooterTroubleshooterResourcesRestClient.CreateAsync(Id.Parent, Id.Name, data, cancellationToken).ConfigureAwait(false);
-                var uri = _selfHelpTroubleshooterTroubleshooterResourcesRestClient.CreateCreateRequestUri(Id.Parent, Id.Name, data);
-                var rehydrationToken = NextLinkOperationImplementation.GetRehydrationToken(RequestMethod.Put, uri.ToUri(), uri.ToString(), "None", null, OperationFinalStateVia.OriginalUri.ToString());
-                var operation = new SelfHelpArmOperation<SelfHelpTroubleshooterResource>(Response.FromValue(new SelfHelpTroubleshooterResource(Client, response), response.GetRawResponse()), rehydrationToken);
-                if (waitUntil == WaitUntil.Completed)
-                    await operation.WaitForCompletionAsync(cancellationToken).ConfigureAwait(false);
-                return operation;
+                RequestContext context = new RequestContext
+                {
+                    CancellationToken = cancellationToken
+                };
+                HttpMessage message = _troubleshooterResourcesRestClient.CreateContinueRequest(Id.Parent, Id.Name, TroubleshooterContinueContent.ToRequestContent(continueRequestBody), context);
+                Response response = await Pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
+                return response;
             }
             catch (Exception e)
             {
@@ -216,45 +231,41 @@ public virtual async Task<ArmOperation<SelfHelpTroubleshooterResource>> UpdateAs
         }
 
         /// <summary>
-        /// Creates the specific troubleshooter action under a resource or subscription using the ‘solutionId’ and  ‘properties.parameters’ as the trigger. &lt;br/&gt; Azure Troubleshooters help with hard to classify issues, reducing the gap between customer observed problems and solutions by guiding the user effortlessly through the troubleshooting process. Each Troubleshooter flow represents a problem area within Azure and has a complex tree-like structure that addresses many root causes. These flows are prepared with the help of Subject Matter experts and customer support engineers by carefully considering previous support requests raised by customers. Troubleshooters terminate at a well curated solution based off of resource backend signals and customer manual selections.
+        /// Uses ‘stepId’ and ‘responses’ as the trigger to continue the troubleshooting steps for the respective troubleshooter resource name. &lt;br/&gt;Continue API is used to provide inputs that are required for the specific troubleshooter to progress into the next step in the process. This API is used after the Troubleshooter has been created using the Create API.
         /// <list type="bullet">
         /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/troubleshooters/{troubleshooterName}</description>
+        /// <term> Request Path. </term>
+        /// <description> /{scope}/providers/Microsoft.Help/troubleshooters/{troubleshooterName}/continue. </description>
         /// </item>
         /// <item>
-        /// <term>Operation Id</term>
-        /// <description>TroubleshooterResource_Create</description>
+        /// <term> Operation Id. </term>
+        /// <description> TroubleshooterResources_Continue. </description>
         /// </item>
         /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
         /// </item>
         /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpTroubleshooterResource"/></description>
+        /// <term> Resource. </term>
+        /// <description> <see cref="SelfHelpTroubleshooterResource"/>. </description>
         /// </item>
         /// </list>
         /// </summary>
-        /// <param name="waitUntil"> <see cref="WaitUntil.Completed"/> if the method should wait to return until the long-running operation has completed on the service; <see cref="WaitUntil.Started"/> if it should return after starting the operation. For more information on long-running operations, please see <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/LongRunningOperations.md"> Azure.Core Long-Running Operation samples</see>. </param>
-        /// <param name="data"> The required request body for this Troubleshooter resource creation. </param>
+        /// <param name="continueRequestBody"> The required request body for going to next step in Troubleshooter resource. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="data"/> is null. </exception>
-        public virtual ArmOperation<SelfHelpTroubleshooterResource> Update(WaitUntil waitUntil, SelfHelpTroubleshooterData data, CancellationToken cancellationToken = default)
+        public virtual Response Continue(TroubleshooterContinueContent continueRequestBody = default, CancellationToken cancellationToken = default)
         {
-            Argument.AssertNotNull(data, nameof(data));
-
-            using var scope = _selfHelpTroubleshooterTroubleshooterResourcesClientDiagnostics.CreateScope("SelfHelpTroubleshooterResource.Update");
+            using DiagnosticScope scope = _troubleshooterResourcesClientDiagnostics.CreateScope("SelfHelpTroubleshooterResource.Continue");
             scope.Start();
             try
             {
-                var response = _selfHelpTroubleshooterTroubleshooterResourcesRestClient.Create(Id.Parent, Id.Name, data, cancellationToken);
-                var uri = _selfHelpTroubleshooterTroubleshooterResourcesRestClient.CreateCreateRequestUri(Id.Parent, Id.Name, data);
-                var rehydrationToken = NextLinkOperationImplementation.GetRehydrationToken(RequestMethod.Put, uri.ToUri(), uri.ToString(), "None", null, OperationFinalStateVia.OriginalUri.ToString());
-                var operation = new SelfHelpArmOperation<SelfHelpTroubleshooterResource>(Response.FromValue(new SelfHelpTroubleshooterResource(Client, response), response.GetRawResponse()), rehydrationToken);
-                if (waitUntil == WaitUntil.Completed)
-                    operation.WaitForCompletion(cancellationToken);
-                return operation;
+                RequestContext context = new RequestContext
+                {
+                    CancellationToken = cancellationToken
+                };
+                HttpMessage message = _troubleshooterResourcesRestClient.CreateContinueRequest(Id.Parent, Id.Name, TroubleshooterContinueContent.ToRequestContent(continueRequestBody), context);
+                Response response = Pipeline.ProcessMessage(message, context);
+                return response;
             }
             catch (Exception e)
             {
@@ -264,35 +275,39 @@ public virtual ArmOperation<SelfHelpTroubleshooterResource> Update(WaitUntil wai
         }
 
         /// <summary>
-        /// Uses ‘stepId’ and ‘responses’ as the trigger to continue the troubleshooting steps for the respective troubleshooter resource name. &lt;br/&gt;Continue API is used to provide inputs that are required for the specific troubleshooter to progress into the next step in the process. This API is used after the Troubleshooter has been created using the Create API.
+        /// Ends the troubleshooter action
         /// <list type="bullet">
         /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/troubleshooters/{troubleshooterName}/continue</description>
+        /// <term> Request Path. </term>
+        /// <description> /{scope}/providers/Microsoft.Help/troubleshooters/{troubleshooterName}/end. </description>
         /// </item>
         /// <item>
-        /// <term>Operation Id</term>
-        /// <description>TroubleshooterResources_Continue</description>
+        /// <term> Operation Id. </term>
+        /// <description> TroubleshooterResources_End. </description>
         /// </item>
         /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
         /// </item>
         /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpTroubleshooterResource"/></description>
+        /// <term> Resource. </term>
+        /// <description> <see cref="SelfHelpTroubleshooterResource"/>. </description>
         /// </item>
         /// </list>
         /// </summary>
-        /// <param name="content"> The required request body for going to next step in Troubleshooter resource. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        public virtual async Task<Response> ContinueAsync(TroubleshooterContinueContent content = null, CancellationToken cancellationToken = default)
+        public virtual async Task<Response> EndAsync(CancellationToken cancellationToken = default)
         {
-            using var scope = _selfHelpTroubleshooterTroubleshooterResourcesClientDiagnostics.CreateScope("SelfHelpTroubleshooterResource.Continue");
+            using DiagnosticScope scope = _troubleshooterResourcesClientDiagnostics.CreateScope("SelfHelpTroubleshooterResource.End");
             scope.Start();
             try
             {
-                var response = await _selfHelpTroubleshooterTroubleshooterResourcesRestClient.ContinueAsync(Id.Parent, Id.Name, content, cancellationToken).ConfigureAwait(false);
+                RequestContext context = new RequestContext
+                {
+                    CancellationToken = cancellationToken
+                };
+                HttpMessage message = _troubleshooterResourcesRestClient.CreateEndRequest(Id.Parent, Id.Name, context);
+                Response response = await Pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
                 return response;
             }
             catch (Exception e)
@@ -303,35 +318,39 @@ public virtual async Task<Response> ContinueAsync(TroubleshooterContinueContent
         }
 
         /// <summary>
-        /// Uses ‘stepId’ and ‘responses’ as the trigger to continue the troubleshooting steps for the respective troubleshooter resource name. &lt;br/&gt;Continue API is used to provide inputs that are required for the specific troubleshooter to progress into the next step in the process. This API is used after the Troubleshooter has been created using the Create API.
+        /// Ends the troubleshooter action
         /// <list type="bullet">
         /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/troubleshooters/{troubleshooterName}/continue</description>
+        /// <term> Request Path. </term>
+        /// <description> /{scope}/providers/Microsoft.Help/troubleshooters/{troubleshooterName}/end. </description>
         /// </item>
         /// <item>
-        /// <term>Operation Id</term>
-        /// <description>TroubleshooterResources_Continue</description>
+        /// <term> Operation Id. </term>
+        /// <description> TroubleshooterResources_End. </description>
         /// </item>
         /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
         /// </item>
         /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpTroubleshooterResource"/></description>
+        /// <term> Resource. </term>
+        /// <description> <see cref="SelfHelpTroubleshooterResource"/>. </description>
         /// </item>
         /// </list>
         /// </summary>
-        /// <param name="content"> The required request body for going to next step in Troubleshooter resource. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        public virtual Response Continue(TroubleshooterContinueContent content = null, CancellationToken cancellationToken = default)
+        public virtual Response End(CancellationToken cancellationToken = default)
         {
-            using var scope = _selfHelpTroubleshooterTroubleshooterResourcesClientDiagnostics.CreateScope("SelfHelpTroubleshooterResource.Continue");
+            using DiagnosticScope scope = _troubleshooterResourcesClientDiagnostics.CreateScope("SelfHelpTroubleshooterResource.End");
             scope.Start();
             try
             {
-                var response = _selfHelpTroubleshooterTroubleshooterResourcesRestClient.Continue(Id.Parent, Id.Name, content, cancellationToken);
+                RequestContext context = new RequestContext
+                {
+                    CancellationToken = cancellationToken
+                };
+                HttpMessage message = _troubleshooterResourcesRestClient.CreateEndRequest(Id.Parent, Id.Name, context);
+                Response response = Pipeline.ProcessMessage(message, context);
                 return response;
             }
             catch (Exception e)
@@ -342,34 +361,44 @@ public virtual Response Continue(TroubleshooterContinueContent content = null, C
         }
 
         /// <summary>
-        /// Ends the troubleshooter action
+        /// Restarts the troubleshooter API using applicable troubleshooter resource name as the input.&lt;br/&gt; It returns new resource name which should be used in subsequent request. The old resource name is obsolete after this API is invoked.
         /// <list type="bullet">
         /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/troubleshooters/{troubleshooterName}/end</description>
+        /// <term> Request Path. </term>
+        /// <description> /{scope}/providers/Microsoft.Help/troubleshooters/{troubleshooterName}/restart. </description>
         /// </item>
         /// <item>
-        /// <term>Operation Id</term>
-        /// <description>TroubleshooterResources_End</description>
+        /// <term> Operation Id. </term>
+        /// <description> TroubleshooterResources_Restart. </description>
         /// </item>
         /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
         /// </item>
         /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpTroubleshooterResource"/></description>
+        /// <term> Resource. </term>
+        /// <description> <see cref="SelfHelpTroubleshooterResource"/>. </description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        public virtual async Task<Response> EndAsync(CancellationToken cancellationToken = default)
+        public virtual async Task<Response<RestartTroubleshooterResult>> RestartAsync(CancellationToken cancellationToken = default)
         {
-            using var scope = _selfHelpTroubleshooterTroubleshooterResourcesClientDiagnostics.CreateScope("SelfHelpTroubleshooterResource.End");
+            using DiagnosticScope scope = _troubleshooterResourcesClientDiagnostics.CreateScope("SelfHelpTroubleshooterResource.Restart");
             scope.Start();
             try
             {
-                var response = await _selfHelpTroubleshooterTroubleshooterResourcesRestClient.EndAsync(Id.Parent, Id.Name, cancellationToken).ConfigureAwait(false);
+                RequestContext context = new RequestContext
+                {
+                    CancellationToken = cancellationToken
+                };
+                HttpMessage message = _troubleshooterResourcesRestClient.CreateRestartRequest(Id.Parent, Id.Name, context);
+                Response result = await Pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
+                Response<RestartTroubleshooterResult> response = Response.FromValue(RestartTroubleshooterResult.FromResponse(result), result);
+                if (response.Value == null)
+                {
+                    throw new RequestFailedException(response.GetRawResponse());
+                }
                 return response;
             }
             catch (Exception e)
@@ -380,34 +409,44 @@ public virtual async Task<Response> EndAsync(CancellationToken cancellationToken
         }
 
         /// <summary>
-        /// Ends the troubleshooter action
+        /// Restarts the troubleshooter API using applicable troubleshooter resource name as the input.&lt;br/&gt; It returns new resource name which should be used in subsequent request. The old resource name is obsolete after this API is invoked.
         /// <list type="bullet">
         /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/troubleshooters/{troubleshooterName}/end</description>
+        /// <term> Request Path. </term>
+        /// <description> /{scope}/providers/Microsoft.Help/troubleshooters/{troubleshooterName}/restart. </description>
         /// </item>
         /// <item>
-        /// <term>Operation Id</term>
-        /// <description>TroubleshooterResources_End</description>
+        /// <term> Operation Id. </term>
+        /// <description> TroubleshooterResources_Restart. </description>
         /// </item>
         /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
         /// </item>
         /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpTroubleshooterResource"/></description>
+        /// <term> Resource. </term>
+        /// <description> <see cref="SelfHelpTroubleshooterResource"/>. </description>
         /// </item>
         /// </list>
         /// </summary>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        public virtual Response End(CancellationToken cancellationToken = default)
+        public virtual Response<RestartTroubleshooterResult> Restart(CancellationToken cancellationToken = default)
         {
-            using var scope = _selfHelpTroubleshooterTroubleshooterResourcesClientDiagnostics.CreateScope("SelfHelpTroubleshooterResource.End");
+            using DiagnosticScope scope = _troubleshooterResourcesClientDiagnostics.CreateScope("SelfHelpTroubleshooterResource.Restart");
             scope.Start();
             try
             {
-                var response = _selfHelpTroubleshooterTroubleshooterResourcesRestClient.End(Id.Parent, Id.Name, cancellationToken);
+                RequestContext context = new RequestContext
+                {
+                    CancellationToken = cancellationToken
+                };
+                HttpMessage message = _troubleshooterResourcesRestClient.CreateRestartRequest(Id.Parent, Id.Name, context);
+                Response result = Pipeline.ProcessMessage(message, context);
+                Response<RestartTroubleshooterResult> response = Response.FromValue(RestartTroubleshooterResult.FromResponse(result), result);
+                if (response.Value == null)
+                {
+                    throw new RequestFailedException(response.GetRawResponse());
+                }
                 return response;
             }
             catch (Exception e)
@@ -418,35 +457,50 @@ public virtual Response End(CancellationToken cancellationToken = default)
         }
 
         /// <summary>
-        /// Restarts the troubleshooter API using applicable troubleshooter resource name as the input.&lt;br/&gt; It returns new resource name which should be used in subsequent request. The old resource name is obsolete after this API is invoked.
+        /// Creates the specific troubleshooter action under a resource or subscription using the ‘solutionId’ and  ‘properties.parameters’ as the trigger. &lt;br/&gt; Azure Troubleshooters help with hard to classify issues, reducing the gap between customer observed problems and solutions by guiding the user effortlessly through the troubleshooting process. Each Troubleshooter flow represents a problem area within Azure and has a complex tree-like structure that addresses many root causes. These flows are prepared with the help of Subject Matter experts and customer support engineers by carefully considering previous support requests raised by customers. Troubleshooters terminate at a well curated solution based off of resource backend signals and customer manual selections.
         /// <list type="bullet">
         /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/troubleshooters/{troubleshooterName}/restart</description>
+        /// <term> Request Path. </term>
+        /// <description> /{scope}/providers/Microsoft.Help/troubleshooters/{troubleshooterName}. </description>
         /// </item>
         /// <item>
-        /// <term>Operation Id</term>
-        /// <description>TroubleshooterResources_Restart</description>
+        /// <term> Operation Id. </term>
+        /// <description> TroubleshooterResources_Create. </description>
         /// </item>
         /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
         /// </item>
         /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpTroubleshooterResource"/></description>
+        /// <term> Resource. </term>
+        /// <description> <see cref="SelfHelpTroubleshooterResource"/>. </description>
         /// </item>
         /// </list>
         /// </summary>
+        /// <param name="waitUntil"> <see cref="WaitUntil.Completed"/> if the method should wait to return until the long-running operation has completed on the service; <see cref="WaitUntil.Started"/> if it should return after starting the operation. For more information on long-running operations, please see <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/LongRunningOperations.md"> Azure.Core Long-Running Operation samples</see>. </param>
+        /// <param name="data"> The required request body for this Troubleshooter resource creation. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        public virtual async Task<Response<RestartTroubleshooterResult>> RestartAsync(CancellationToken cancellationToken = default)
+        public virtual async Task<ArmOperation<SelfHelpTroubleshooterResource>> UpdateAsync(WaitUntil waitUntil, SelfHelpTroubleshooterData data = default, CancellationToken cancellationToken = default)
         {
-            using var scope = _selfHelpTroubleshooterTroubleshooterResourcesClientDiagnostics.CreateScope("SelfHelpTroubleshooterResource.Restart");
+            using DiagnosticScope scope = _troubleshooterResourcesClientDiagnostics.CreateScope("SelfHelpTroubleshooterResource.Update");
             scope.Start();
             try
             {
-                var response = await _selfHelpTroubleshooterTroubleshooterResourcesRestClient.RestartAsync(Id.Parent, Id.Name, cancellationToken).ConfigureAwait(false);
-                return response;
+                RequestContext context = new RequestContext
+                {
+                    CancellationToken = cancellationToken
+                };
+                HttpMessage message = _troubleshooterResourcesRestClient.CreateCreateRequest(Id.Parent, Id.Name, SelfHelpTroubleshooterData.ToRequestContent(data), context);
+                Response result = await Pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false);
+                Response<SelfHelpTroubleshooterData> response = Response.FromValue(SelfHelpTroubleshooterData.FromResponse(result), result);
+                RequestUriBuilder uri = message.Request.Uri;
+                RehydrationToken rehydrationToken = NextLinkOperationImplementation.GetRehydrationToken(RequestMethod.Put, uri.ToUri(), uri.ToString(), "None", null, OperationFinalStateVia.OriginalUri.ToString());
+                SelfHelpArmOperation<SelfHelpTroubleshooterResource> operation = new SelfHelpArmOperation<SelfHelpTroubleshooterResource>(Response.FromValue(new SelfHelpTroubleshooterResource(Client, response.Value), response.GetRawResponse()), rehydrationToken);
+                if (waitUntil == WaitUntil.Completed)
+                {
+                    await operation.WaitForCompletionAsync(cancellationToken).ConfigureAwait(false);
+                }
+                return operation;
             }
             catch (Exception e)
             {
@@ -456,35 +510,50 @@ public virtual async Task<Response<RestartTroubleshooterResult>> RestartAsync(Ca
         }
 
         /// <summary>
-        /// Restarts the troubleshooter API using applicable troubleshooter resource name as the input.&lt;br/&gt; It returns new resource name which should be used in subsequent request. The old resource name is obsolete after this API is invoked.
+        /// Creates the specific troubleshooter action under a resource or subscription using the ‘solutionId’ and  ‘properties.parameters’ as the trigger. &lt;br/&gt; Azure Troubleshooters help with hard to classify issues, reducing the gap between customer observed problems and solutions by guiding the user effortlessly through the troubleshooting process. Each Troubleshooter flow represents a problem area within Azure and has a complex tree-like structure that addresses many root causes. These flows are prepared with the help of Subject Matter experts and customer support engineers by carefully considering previous support requests raised by customers. Troubleshooters terminate at a well curated solution based off of resource backend signals and customer manual selections.
         /// <list type="bullet">
         /// <item>
-        /// <term>Request Path</term>
-        /// <description>/{scope}/providers/Microsoft.Help/troubleshooters/{troubleshooterName}/restart</description>
+        /// <term> Request Path. </term>
+        /// <description> /{scope}/providers/Microsoft.Help/troubleshooters/{troubleshooterName}. </description>
         /// </item>
         /// <item>
-        /// <term>Operation Id</term>
-        /// <description>TroubleshooterResources_Restart</description>
+        /// <term> Operation Id. </term>
+        /// <description> TroubleshooterResources_Create. </description>
         /// </item>
         /// <item>
-        /// <term>Default Api Version</term>
-        /// <description>2024-03-01-preview</description>
+        /// <term> Default Api Version. </term>
+        /// <description> 2024-03-01-preview. </description>
         /// </item>
         /// <item>
-        /// <term>Resource</term>
-        /// <description><see cref="SelfHelpTroubleshooterResource"/></description>
+        /// <term> Resource. </term>
+        /// <description> <see cref="SelfHelpTroubleshooterResource"/>. </description>
         /// </item>
         /// </list>
         /// </summary>
+        /// <param name="waitUntil"> <see cref="WaitUntil.Completed"/> if the method should wait to return until the long-running operation has completed on the service; <see cref="WaitUntil.Started"/> if it should return after starting the operation. For more information on long-running operations, please see <see href="https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/Azure.Core/samples/LongRunningOperations.md"> Azure.Core Long-Running Operation samples</see>. </param>
+        /// <param name="data"> The required request body for this Troubleshooter resource creation. </param>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
-        public virtual Response<RestartTroubleshooterResult> Restart(CancellationToken cancellationToken = default)
+        public virtual ArmOperation<SelfHelpTroubleshooterResource> Update(WaitUntil waitUntil, SelfHelpTroubleshooterData data = default, CancellationToken cancellationToken = default)
         {
-            using var scope = _selfHelpTroubleshooterTroubleshooterResourcesClientDiagnostics.CreateScope("SelfHelpTroubleshooterResource.Restart");
+            using DiagnosticScope scope = _troubleshooterResourcesClientDiagnostics.CreateScope("SelfHelpTroubleshooterResource.Update");
             scope.Start();
             try
             {
-                var response = _selfHelpTroubleshooterTroubleshooterResourcesRestClient.Restart(Id.Parent, Id.Name, cancellationToken);
-                return response;
+                RequestContext context = new RequestContext
+                {
+                    CancellationToken = cancellationToken
+                };
+                HttpMessage message = _troubleshooterResourcesRestClient.CreateCreateRequest(Id.Parent, Id.Name, SelfHelpTroubleshooterData.ToRequestContent(data), context);
+                Response result = Pipeline.ProcessMessage(message, context);
+                Response<SelfHelpTroubleshooterData> response = Response.FromValue(SelfHelpTroubleshooterData.FromResponse(result), result);
+                RequestUriBuilder uri = message.Request.Uri;
+                RehydrationToken rehydrationToken = NextLinkOperationImplementation.GetRehydrationToken(RequestMethod.Put, uri.ToUri(), uri.ToString(), "None", null, OperationFinalStateVia.OriginalUri.ToString());
+                SelfHelpArmOperation<SelfHelpTroubleshooterResource> operation = new SelfHelpArmOperation<SelfHelpTroubleshooterResource>(Response.FromValue(new SelfHelpTroubleshooterResource(Client, response.Value), response.GetRawResponse()), rehydrationToken);
+                if (waitUntil == WaitUntil.Completed)
+                {
+                    operation.WaitForCompletion(cancellationToken);
+                }
+                return operation;
             }
             catch (Exception e)
             {
diff --git a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/tsp-location.yaml b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/tsp-location.yaml
index 5966c74efe42..c9ecca714c95 100644
--- a/sdk/selfhelp/Azure.ResourceManager.SelfHelp/tsp-location.yaml
+++ b/sdk/selfhelp/Azure.ResourceManager.SelfHelp/tsp-location.yaml
@@ -1,5 +1,6 @@
 directory: specification/help/resource-manager/Microsoft.Help/Help
 repo: Azure/azure-rest-api-specs
-commit: 52fc376d009c4d96b89cfc410c11a38358a18f5b
+commit: 67ee90ea110caeb9cfbea3f353cf08ead638360b
 additionalDirectories: []
-emitterPackageJsonPath: eng/legacy-emitter-package.json
+# emitterPackageJsonPath: eng/legacy-emitter-package.json
+emitterPackageJsonPath: "eng/azure-typespec-http-client-csharp-mgmt-emitter-package.json"