diff --git a/src/MonitoringSolutions/MonitoringSolutions.Autorest/Properties/AssemblyInfo.cs b/src/MonitoringSolutions/MonitoringSolutions.Autorest/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000000..0c7475b67323
--- /dev/null
+++ b/src/MonitoringSolutions/MonitoringSolutions.Autorest/Properties/AssemblyInfo.cs
@@ -0,0 +1,26 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the ""License"");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an ""AS IS"" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// Code generated by Microsoft (R) AutoRest Code Generator.Changes may cause incorrect behavior and will be lost if the code
+// is regenerated.
+
+using System;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+[assembly: System.Reflection.AssemblyCompanyAttribute("Microsoft")]
+[assembly: System.Reflection.AssemblyCopyrightAttribute("Copyright © Microsoft")]
+[assembly: System.Reflection.AssemblyProductAttribute("Microsoft Azure PowerShell")]
+[assembly: System.Reflection.AssemblyTitleAttribute("Microsoft Azure PowerShell - MonitoringSolutions")]
+[assembly: System.Reflection.AssemblyFileVersionAttribute("0.1.2")]
+[assembly: System.Reflection.AssemblyVersionAttribute("0.1.2")]
+[assembly: System.Runtime.InteropServices.ComVisibleAttribute(false)]
+[assembly: System.CLSCompliantAttribute(false)]
diff --git a/src/MonitoringSolutions/MonitoringSolutions.Autorest/README.md b/src/MonitoringSolutions/MonitoringSolutions.Autorest/README.md
index ab69209b6d61..df90726bb5ae 100644
--- a/src/MonitoringSolutions/MonitoringSolutions.Autorest/README.md
+++ b/src/MonitoringSolutions/MonitoringSolutions.Autorest/README.md
@@ -55,10 +55,6 @@ subject-prefix: MonitorLogAnalytics
 
 inlining-threshold: 40
 
-# For new modules, please avoid setting 3.x using the use-extension method and instead, use 4.x as the default option
-use-extension:
-  "@autorest/powershell": "3.x"
-
 directive:
   # Fix error in swagger: PUT, PATCH, DELETE of solutions are not long running
   - from: swagger-document
@@ -67,7 +63,10 @@ directive:
     transform: return $.replace(/"x-ms-long-running-operation":\ true/g, "\"x-ms-long-running-operation\":\ false")
   # Remove the unexpanded parameter set
   - where:
-      variant: ^Create$|^CreateViaIdentity$|^CreateViaIdentityExpanded$|^Update$|^UpdateViaIdentity$
+      variant: ^(Create|Update)(?!.*?Expanded)
+    remove: true
+  - where:
+      variant: ^CreateViaIdentityExpanded$
     remove: true
   # Remove the set-* cmdlet
   - where:
diff --git a/src/MonitoringSolutions/MonitoringSolutions.Autorest/custom/New-AzMonitorLogAnalyticsSolution.ps1 b/src/MonitoringSolutions/MonitoringSolutions.Autorest/custom/New-AzMonitorLogAnalyticsSolution.ps1
index d8904d5f1e4c..e6608e9bda3b 100644
--- a/src/MonitoringSolutions/MonitoringSolutions.Autorest/custom/New-AzMonitorLogAnalyticsSolution.ps1
+++ b/src/MonitoringSolutions/MonitoringSolutions.Autorest/custom/New-AzMonitorLogAnalyticsSolution.ps1
@@ -1,7 +1,7 @@
 
 # ----------------------------------------------------------------------------------
 #
-# Copyright Microsoft Corporation
+# Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -11,6 +11,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# Code generated by Microsoft (R) AutoRest Code Generator.Changes may cause incorrect behavior and will be lost if the code
+# is regenerated.
 # ----------------------------------------------------------------------------------
 
 <#
@@ -18,15 +20,34 @@
 Creates a log analytics solution.
 .Description
 Creates a log analytics solution.
+.Example
+$workspace = Get-AzOperationalInsightsWorkspace -ResourceGroupName azureps-manual-test -Name monitoringworkspace-2vob7n
+New-AzMonitorLogAnalyticsSolution -Type Containers -ResourceGroupName azureps-manual-test -Location $workspace.Location -WorkspaceResourceId $workspace.ResourceId
+
+.Inputs
+Microsoft.Azure.PowerShell.Cmdlets.MonitoringSolutions.Models.IMonitoringSolutionsIdentity
 .Outputs
-Microsoft.Azure.PowerShell.Cmdlets.MonitoringSolutions.Models.Api20151101Preview.ISolution
+Microsoft.Azure.PowerShell.Cmdlets.MonitoringSolutions.Models.ISolution
+.Notes
+COMPLEX PARAMETER PROPERTIES
+
+To create the parameters described below, construct a hash table containing the appropriate properties. For information on hash tables, run Get-Help about_Hash_Tables.
+
+INPUTOBJECT <IMonitoringSolutionsIdentity>: Identity Parameter
+  [Id <String>]: Resource identity path
+  [ManagementAssociationName <String>]: User ManagementAssociation Name.
+  [ManagementConfigurationName <String>]: User Management Configuration Name.
+  [ProviderName <String>]: Provider name for the parent resource.
+  [ResourceGroupName <String>]: The name of the resource group to get. The name is case insensitive.
+  [ResourceName <String>]: Parent resource name.
+  [ResourceType <String>]: Resource type for the parent resource
+  [SolutionName <String>]: User Solution Name.
+  [SubscriptionId <String>]: Gets subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call.
 .Link
 https://learn.microsoft.com/powershell/module/az.monitoringsolutions/new-azmonitorloganalyticssolution
-.LINK
-[Get-AzOperationalInsightsWorkspace](https://learn.microsoft.com/powershell/module/az.operationalinsights/get-azoperationalinsightsworkspace)
 #>
 function New-AzMonitorLogAnalyticsSolution {
-    [OutputType([Microsoft.Azure.PowerShell.Cmdlets.MonitoringSolutions.Models.Api20151101Preview.ISolution])]
+    [OutputType([Microsoft.Azure.PowerShell.Cmdlets.MonitoringSolutions.Models.ISolution])]
     [CmdletBinding(DefaultParameterSetName = 'CreateExpanded', PositionalBinding = $false, SupportsShouldProcess, ConfirmImpact = 'Medium')]
     param(
         [Parameter(Mandatory)]
@@ -58,12 +79,12 @@ function New-AzMonitorLogAnalyticsSolution {
 
         [Parameter()]
         [Microsoft.Azure.PowerShell.Cmdlets.MonitoringSolutions.Category('Body')]
-        [Microsoft.Azure.PowerShell.Cmdlets.MonitoringSolutions.Runtime.Info(PossibleTypes = ([Microsoft.Azure.PowerShell.Cmdlets.MonitoringSolutions.Models.Api20151101Preview.ISolutionTags]))]
+        [Microsoft.Azure.PowerShell.Cmdlets.MonitoringSolutions.Runtime.Info(PossibleTypes = ([Microsoft.Azure.PowerShell.Cmdlets.MonitoringSolutions.Models.ISolutionTags]))]
         [System.Collections.Hashtable]
         # Resource tags
         ${Tag},
 
-        [Parameter(Mandatory)]
+        [Parameter(ParameterSetName='CreateExpanded', Mandatory)]
         [Microsoft.Azure.PowerShell.Cmdlets.MonitoringSolutions.Category('Body')]
         [System.String]
         # The Azure resource ID for the workspace where the solution will be deployed/enabled.
@@ -74,7 +95,8 @@ function New-AzMonitorLogAnalyticsSolution {
         [ValidateNotNull()]
         [Microsoft.Azure.PowerShell.Cmdlets.MonitoringSolutions.Category('Azure')]
         [System.Management.Automation.PSObject]
-        # The credentials, account, tenant, and subscription used for communication with Azure.
+        # The DefaultProfile parameter is not functional.
+        # Use the SubscriptionId parameter when available if executing the cmdlet against a different subscription.
         ${DefaultProfile},
 
         [Parameter(DontShow)]
diff --git a/src/MonitoringSolutions/MonitoringSolutions.Autorest/docs/Az.MonitoringSolutions.md b/src/MonitoringSolutions/MonitoringSolutions.Autorest/docs/Az.MonitoringSolutions.md
index c38c4d472a76..d986f584261c 100644
--- a/src/MonitoringSolutions/MonitoringSolutions.Autorest/docs/Az.MonitoringSolutions.md
+++ b/src/MonitoringSolutions/MonitoringSolutions.Autorest/docs/Az.MonitoringSolutions.md
@@ -1,6 +1,6 @@
 ---
 Module Name: Az.MonitoringSolutions
-Module Guid: 4e0cdc62-833e-41bd-aa97-f8f042986de3
+Module Guid: a1bb7fa0-c386-4a56-a152-18e635e436e2
 Download Help Link: https://learn.microsoft.com/powershell/module/az.monitoringsolutions
 Help Version: 1.0.0.0
 Locale: en-US
@@ -21,5 +21,5 @@ Creates a log analytics solution.
 Deletes the solution in the subscription.
 
 ### [Update-AzMonitorLogAnalyticsSolution](Update-AzMonitorLogAnalyticsSolution.md)
-Update the tags of a solution.
+update the tags of a solution.
 
diff --git a/src/MonitoringSolutions/MonitoringSolutions.Autorest/docs/Get-AzMonitorLogAnalyticsSolution.md b/src/MonitoringSolutions/MonitoringSolutions.Autorest/docs/Get-AzMonitorLogAnalyticsSolution.md
index 5bdbefbe8d38..d96075ff1a33 100644
--- a/src/MonitoringSolutions/MonitoringSolutions.Autorest/docs/Get-AzMonitorLogAnalyticsSolution.md
+++ b/src/MonitoringSolutions/MonitoringSolutions.Autorest/docs/Get-AzMonitorLogAnalyticsSolution.md
@@ -128,7 +128,6 @@ Accept wildcard characters: False
 
 ### -InputObject
 Identity Parameter
-To construct, see NOTES section for INPUTOBJECT properties and create a hash table.
 
 ```yaml
 Type: Microsoft.Azure.PowerShell.Cmdlets.MonitoringSolutions.Models.IMonitoringSolutionsIdentity
@@ -198,7 +197,9 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 
 ## OUTPUTS
 
-### Microsoft.Azure.PowerShell.Cmdlets.MonitoringSolutions.Models.Api20151101Preview.ISolution
+### Microsoft.Azure.PowerShell.Cmdlets.MonitoringSolutions.Models.ISolution
+
+### Microsoft.Azure.PowerShell.Cmdlets.MonitoringSolutions.Models.ISolutionPropertiesList
 
 ## NOTES
 
diff --git a/src/MonitoringSolutions/MonitoringSolutions.Autorest/docs/New-AzMonitorLogAnalyticsSolution.md b/src/MonitoringSolutions/MonitoringSolutions.Autorest/docs/New-AzMonitorLogAnalyticsSolution.md
index 8d24270b7fec..d9f71abe3591 100644
--- a/src/MonitoringSolutions/MonitoringSolutions.Autorest/docs/New-AzMonitorLogAnalyticsSolution.md
+++ b/src/MonitoringSolutions/MonitoringSolutions.Autorest/docs/New-AzMonitorLogAnalyticsSolution.md
@@ -61,7 +61,8 @@ Commonly used types are:
 ## PARAMETERS
 
 ### -DefaultProfile
-The credentials, account, tenant, and subscription used for communication with Azure.
+The DefaultProfile parameter is not functional.
+Use the SubscriptionId parameter when available if executing the cmdlet against a different subscription.
 
 ```yaml
 Type: System.Management.Automation.PSObject
@@ -205,15 +206,13 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 
 ## INPUTS
 
+### Microsoft.Azure.PowerShell.Cmdlets.MonitoringSolutions.Models.IMonitoringSolutionsIdentity
+
 ## OUTPUTS
 
-### Microsoft.Azure.PowerShell.Cmdlets.MonitoringSolutions.Models.Api20151101Preview.ISolution
+### Microsoft.Azure.PowerShell.Cmdlets.MonitoringSolutions.Models.ISolution
 
 ## NOTES
 
 ## RELATED LINKS
 
-
-
-[Get-AzOperationalInsightsWorkspace](https://learn.microsoft.com/powershell/module/az.operationalinsights/get-azoperationalinsightsworkspace)
-
diff --git a/src/MonitoringSolutions/MonitoringSolutions.Autorest/docs/Remove-AzMonitorLogAnalyticsSolution.md b/src/MonitoringSolutions/MonitoringSolutions.Autorest/docs/Remove-AzMonitorLogAnalyticsSolution.md
index d41d1d1d10dd..80ca5d7f38e1 100644
--- a/src/MonitoringSolutions/MonitoringSolutions.Autorest/docs/Remove-AzMonitorLogAnalyticsSolution.md
+++ b/src/MonitoringSolutions/MonitoringSolutions.Autorest/docs/Remove-AzMonitorLogAnalyticsSolution.md
@@ -71,7 +71,6 @@ Accept wildcard characters: False
 
 ### -InputObject
 Identity Parameter
-To construct, see NOTES section for INPUTOBJECT properties and create a hash table.
 
 ```yaml
 Type: Microsoft.Azure.PowerShell.Cmdlets.MonitoringSolutions.Models.IMonitoringSolutionsIdentity
diff --git a/src/MonitoringSolutions/MonitoringSolutions.Autorest/docs/Update-AzMonitorLogAnalyticsSolution.md b/src/MonitoringSolutions/MonitoringSolutions.Autorest/docs/Update-AzMonitorLogAnalyticsSolution.md
index 952a248de2b6..f6de6b22c89b 100644
--- a/src/MonitoringSolutions/MonitoringSolutions.Autorest/docs/Update-AzMonitorLogAnalyticsSolution.md
+++ b/src/MonitoringSolutions/MonitoringSolutions.Autorest/docs/Update-AzMonitorLogAnalyticsSolution.md
@@ -8,7 +8,7 @@ schema: 2.0.0
 # Update-AzMonitorLogAnalyticsSolution
 
 ## SYNOPSIS
-Update the tags of a solution.
+update the tags of a solution.
 
 ## SYNTAX
 
@@ -25,7 +25,7 @@ Update-AzMonitorLogAnalyticsSolution -InputObject <IMonitoringSolutionsIdentity>
 ```
 
 ## DESCRIPTION
-Update the tags of a solution.
+update the tags of a solution.
 
 ## EXAMPLES
 
@@ -76,7 +76,6 @@ Accept wildcard characters: False
 
 ### -InputObject
 Identity Parameter
-To construct, see NOTES section for INPUTOBJECT properties and create a hash table.
 
 ```yaml
 Type: Microsoft.Azure.PowerShell.Cmdlets.MonitoringSolutions.Models.IMonitoringSolutionsIdentity
@@ -192,7 +191,7 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 
 ## OUTPUTS
 
-### Microsoft.Azure.PowerShell.Cmdlets.MonitoringSolutions.Models.Api20151101Preview.ISolution
+### Microsoft.Azure.PowerShell.Cmdlets.MonitoringSolutions.Models.ISolution
 
 ## NOTES
 
diff --git a/src/MonitoringSolutions/MonitoringSolutions.Autorest/examples/New-AzMonitorLogAnalyticsSolution.md b/src/MonitoringSolutions/MonitoringSolutions.Autorest/examples/New-AzMonitorLogAnalyticsSolution.md
index 623f34d733ba..1667a71c7b0d 100644
--- a/src/MonitoringSolutions/MonitoringSolutions.Autorest/examples/New-AzMonitorLogAnalyticsSolution.md
+++ b/src/MonitoringSolutions/MonitoringSolutions.Autorest/examples/New-AzMonitorLogAnalyticsSolution.md
@@ -32,4 +32,3 @@ Commonly used types are:
 | AzureAutomation |	Automation Hybrid Worker |
 | LogicAppsManagement | Logic Apps Management |
 | SQLDataClassification | SQL Data Discovery & Classification |
-
diff --git a/src/MonitoringSolutions/MonitoringSolutions.Autorest/generate-info.json b/src/MonitoringSolutions/MonitoringSolutions.Autorest/generate-info.json
index a295dbd0d757..656a7fd79895 100644
--- a/src/MonitoringSolutions/MonitoringSolutions.Autorest/generate-info.json
+++ b/src/MonitoringSolutions/MonitoringSolutions.Autorest/generate-info.json
@@ -1,3 +1,3 @@
 {
-  "generate_Id": "dcbd66ba-7ce8-4e55-ab03-e426736a30af"
+  "generate_Id": "0f52014a-cf5f-4a75-a510-d654b383d47c"
 }
diff --git a/src/MonitoringSolutions/MonitoringSolutions.Autorest/resources/README.md b/src/MonitoringSolutions/MonitoringSolutions.Autorest/resources/README.md
new file mode 100644
index 000000000000..937f07f8fec2
--- /dev/null
+++ b/src/MonitoringSolutions/MonitoringSolutions.Autorest/resources/README.md
@@ -0,0 +1,11 @@
+# Resources
+This directory can contain any additional resources for module that are not required at runtime. This directory **does not** get packaged with the module. If you have assets for custom implementation, place them into the `..\custom` folder.
+
+## Info
+- Modifiable: yes
+- Generated: no
+- Committed: yes
+- Packaged: no
+
+## Purpose
+Use this folder to put anything you want to keep around as part of the repository for the module, but is not something that is required for the module. For example, development files, packaged builds, or additional information. This is only intended to be used in repositories where the module's output directory is cleaned, but tangential resources for the module want to remain intact.
\ No newline at end of file
diff --git a/src/MonitoringSolutions/MonitoringSolutions.Autorest/test/utils.ps1 b/src/MonitoringSolutions/MonitoringSolutions.Autorest/test/utils.ps1
index 1f38222445d3..f9c9dcd5dfda 100644
--- a/src/MonitoringSolutions/MonitoringSolutions.Autorest/test/utils.ps1
+++ b/src/MonitoringSolutions/MonitoringSolutions.Autorest/test/utils.ps1
@@ -61,8 +61,8 @@ function setupEnv() {
     set-content -Path .\test\deployment-templates\operational-insightsworkspace\parameters.json -Value (ConvertTo-Json $workspacesParam)
     New-AzDeployment -Mode Incremental -TemplateFile .\test\deployment-templates\operational-insightsworkspace\template.json -TemplateParameterFile .\test\deployment-templates\operational-insightsworkspace\parameters.json -ResourceGroupName $env.resourceGroup
     #>
-    $workspace01 = New-AzOperationalInsightsWorkspace -ResourceGroupName $env.resourceGroup -Name $workspacesName01 -Location $env.location -Sku "Standard"
-    $workspace02 = New-AzOperationalInsightsWorkspace -ResourceGroupName $env.resourceGroup -Name $workspacesName02 -Location $env.location -Sku "Standard"
+    $workspace01 = New-AzOperationalInsightsWorkspace -ResourceGroupName $env.resourceGroup -Name $workspacesName01 -Location $env.location
+    $workspace02 = New-AzOperationalInsightsWorkspace -ResourceGroupName $env.resourceGroup -Name $workspacesName02 -Location $env.location
     $null = $env.Add('workspaceResourceId01', $workspace01.ResourceId)
     $null = $env.Add('workspaceResourceId02', $workspace02.ResourceId)
     Write-Host -ForegroundColor Green 'The operational insights workspace deployed successfully'
diff --git a/src/MonitoringSolutions/MonitoringSolutions.sln b/src/MonitoringSolutions/MonitoringSolutions.sln
index d24ce2559e12..77b901e9dc96 100644
--- a/src/MonitoringSolutions/MonitoringSolutions.sln
+++ b/src/MonitoringSolutions/MonitoringSolutions.sln
@@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.31903.59
@@ -19,49 +19,119 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authenticators", "..\Accoun
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonitoringSolutions", "MonitoringSolutions\MonitoringSolutions.csproj", "{0451CED9-A9D5-4592-B69C-573BF135FCC5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Az.MonitoringSolutions", "..\..\generated\MonitoringSolutions\MonitoringSolutions.Autorest\Az.MonitoringSolutions.csproj", "{D5FC8E03-A320-49B7-B1AB-DCC35F0186ED}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MonitoringSolutions.Autorest", "MonitoringSolutions.Autorest", "{3A5910AE-16FB-0E4A-CB83-F683AD5A17DE}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Az.MonitoringSolutions", "..\..\generated\MonitoringSolutions\MonitoringSolutions.Autorest\Az.MonitoringSolutions.csproj", "{52B2B291-EF40-4436-BA3E-C56829E20648}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{74C9B4A3-9F4C-4A93-A8DB-C25CFB4FD812}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{74C9B4A3-9F4C-4A93-A8DB-C25CFB4FD812}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{74C9B4A3-9F4C-4A93-A8DB-C25CFB4FD812}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{74C9B4A3-9F4C-4A93-A8DB-C25CFB4FD812}.Debug|x64.Build.0 = Debug|Any CPU
+		{74C9B4A3-9F4C-4A93-A8DB-C25CFB4FD812}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{74C9B4A3-9F4C-4A93-A8DB-C25CFB4FD812}.Debug|x86.Build.0 = Debug|Any CPU
 		{74C9B4A3-9F4C-4A93-A8DB-C25CFB4FD812}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{74C9B4A3-9F4C-4A93-A8DB-C25CFB4FD812}.Release|Any CPU.Build.0 = Release|Any CPU
+		{74C9B4A3-9F4C-4A93-A8DB-C25CFB4FD812}.Release|x64.ActiveCfg = Release|Any CPU
+		{74C9B4A3-9F4C-4A93-A8DB-C25CFB4FD812}.Release|x64.Build.0 = Release|Any CPU
+		{74C9B4A3-9F4C-4A93-A8DB-C25CFB4FD812}.Release|x86.ActiveCfg = Release|Any CPU
+		{74C9B4A3-9F4C-4A93-A8DB-C25CFB4FD812}.Release|x86.Build.0 = Release|Any CPU
 		{6F6B004E-098E-4C86-B439-B69538543639}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6F6B004E-098E-4C86-B439-B69538543639}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6F6B004E-098E-4C86-B439-B69538543639}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6F6B004E-098E-4C86-B439-B69538543639}.Debug|x64.Build.0 = Debug|Any CPU
+		{6F6B004E-098E-4C86-B439-B69538543639}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6F6B004E-098E-4C86-B439-B69538543639}.Debug|x86.Build.0 = Debug|Any CPU
 		{6F6B004E-098E-4C86-B439-B69538543639}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6F6B004E-098E-4C86-B439-B69538543639}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6F6B004E-098E-4C86-B439-B69538543639}.Release|x64.ActiveCfg = Release|Any CPU
+		{6F6B004E-098E-4C86-B439-B69538543639}.Release|x64.Build.0 = Release|Any CPU
+		{6F6B004E-098E-4C86-B439-B69538543639}.Release|x86.ActiveCfg = Release|Any CPU
+		{6F6B004E-098E-4C86-B439-B69538543639}.Release|x86.Build.0 = Release|Any CPU
 		{23629234-6A30-455B-BC1B-B6B738ECFD76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{23629234-6A30-455B-BC1B-B6B738ECFD76}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{23629234-6A30-455B-BC1B-B6B738ECFD76}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{23629234-6A30-455B-BC1B-B6B738ECFD76}.Debug|x64.Build.0 = Debug|Any CPU
+		{23629234-6A30-455B-BC1B-B6B738ECFD76}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{23629234-6A30-455B-BC1B-B6B738ECFD76}.Debug|x86.Build.0 = Debug|Any CPU
 		{23629234-6A30-455B-BC1B-B6B738ECFD76}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{23629234-6A30-455B-BC1B-B6B738ECFD76}.Release|Any CPU.Build.0 = Release|Any CPU
+		{23629234-6A30-455B-BC1B-B6B738ECFD76}.Release|x64.ActiveCfg = Release|Any CPU
+		{23629234-6A30-455B-BC1B-B6B738ECFD76}.Release|x64.Build.0 = Release|Any CPU
+		{23629234-6A30-455B-BC1B-B6B738ECFD76}.Release|x86.ActiveCfg = Release|Any CPU
+		{23629234-6A30-455B-BC1B-B6B738ECFD76}.Release|x86.Build.0 = Release|Any CPU
 		{E5EB7514-ED99-49C6-852B-97429FC8A88D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E5EB7514-ED99-49C6-852B-97429FC8A88D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E5EB7514-ED99-49C6-852B-97429FC8A88D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E5EB7514-ED99-49C6-852B-97429FC8A88D}.Debug|x64.Build.0 = Debug|Any CPU
+		{E5EB7514-ED99-49C6-852B-97429FC8A88D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E5EB7514-ED99-49C6-852B-97429FC8A88D}.Debug|x86.Build.0 = Debug|Any CPU
 		{E5EB7514-ED99-49C6-852B-97429FC8A88D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E5EB7514-ED99-49C6-852B-97429FC8A88D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E5EB7514-ED99-49C6-852B-97429FC8A88D}.Release|x64.ActiveCfg = Release|Any CPU
+		{E5EB7514-ED99-49C6-852B-97429FC8A88D}.Release|x64.Build.0 = Release|Any CPU
+		{E5EB7514-ED99-49C6-852B-97429FC8A88D}.Release|x86.ActiveCfg = Release|Any CPU
+		{E5EB7514-ED99-49C6-852B-97429FC8A88D}.Release|x86.Build.0 = Release|Any CPU
 		{3BB41B82-845F-4438-B38B-CB5CD37D42C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3BB41B82-845F-4438-B38B-CB5CD37D42C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3BB41B82-845F-4438-B38B-CB5CD37D42C4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3BB41B82-845F-4438-B38B-CB5CD37D42C4}.Debug|x64.Build.0 = Debug|Any CPU
+		{3BB41B82-845F-4438-B38B-CB5CD37D42C4}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3BB41B82-845F-4438-B38B-CB5CD37D42C4}.Debug|x86.Build.0 = Debug|Any CPU
 		{3BB41B82-845F-4438-B38B-CB5CD37D42C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3BB41B82-845F-4438-B38B-CB5CD37D42C4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3BB41B82-845F-4438-B38B-CB5CD37D42C4}.Release|x64.ActiveCfg = Release|Any CPU
+		{3BB41B82-845F-4438-B38B-CB5CD37D42C4}.Release|x64.Build.0 = Release|Any CPU
+		{3BB41B82-845F-4438-B38B-CB5CD37D42C4}.Release|x86.ActiveCfg = Release|Any CPU
+		{3BB41B82-845F-4438-B38B-CB5CD37D42C4}.Release|x86.Build.0 = Release|Any CPU
 		{B9E0F05A-2122-459B-9A89-E2618F7173E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B9E0F05A-2122-459B-9A89-E2618F7173E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B9E0F05A-2122-459B-9A89-E2618F7173E5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B9E0F05A-2122-459B-9A89-E2618F7173E5}.Debug|x64.Build.0 = Debug|Any CPU
+		{B9E0F05A-2122-459B-9A89-E2618F7173E5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B9E0F05A-2122-459B-9A89-E2618F7173E5}.Debug|x86.Build.0 = Debug|Any CPU
 		{B9E0F05A-2122-459B-9A89-E2618F7173E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B9E0F05A-2122-459B-9A89-E2618F7173E5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B9E0F05A-2122-459B-9A89-E2618F7173E5}.Release|x64.ActiveCfg = Release|Any CPU
+		{B9E0F05A-2122-459B-9A89-E2618F7173E5}.Release|x64.Build.0 = Release|Any CPU
+		{B9E0F05A-2122-459B-9A89-E2618F7173E5}.Release|x86.ActiveCfg = Release|Any CPU
+		{B9E0F05A-2122-459B-9A89-E2618F7173E5}.Release|x86.Build.0 = Release|Any CPU
 		{0451CED9-A9D5-4592-B69C-573BF135FCC5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0451CED9-A9D5-4592-B69C-573BF135FCC5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0451CED9-A9D5-4592-B69C-573BF135FCC5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0451CED9-A9D5-4592-B69C-573BF135FCC5}.Debug|x64.Build.0 = Debug|Any CPU
+		{0451CED9-A9D5-4592-B69C-573BF135FCC5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0451CED9-A9D5-4592-B69C-573BF135FCC5}.Debug|x86.Build.0 = Debug|Any CPU
 		{0451CED9-A9D5-4592-B69C-573BF135FCC5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0451CED9-A9D5-4592-B69C-573BF135FCC5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D5FC8E03-A320-49B7-B1AB-DCC35F0186ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D5FC8E03-A320-49B7-B1AB-DCC35F0186ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D5FC8E03-A320-49B7-B1AB-DCC35F0186ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D5FC8E03-A320-49B7-B1AB-DCC35F0186ED}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0451CED9-A9D5-4592-B69C-573BF135FCC5}.Release|x64.ActiveCfg = Release|Any CPU
+		{0451CED9-A9D5-4592-B69C-573BF135FCC5}.Release|x64.Build.0 = Release|Any CPU
+		{0451CED9-A9D5-4592-B69C-573BF135FCC5}.Release|x86.ActiveCfg = Release|Any CPU
+		{0451CED9-A9D5-4592-B69C-573BF135FCC5}.Release|x86.Build.0 = Release|Any CPU
+		{52B2B291-EF40-4436-BA3E-C56829E20648}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{52B2B291-EF40-4436-BA3E-C56829E20648}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{52B2B291-EF40-4436-BA3E-C56829E20648}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{52B2B291-EF40-4436-BA3E-C56829E20648}.Debug|x64.Build.0 = Debug|Any CPU
+		{52B2B291-EF40-4436-BA3E-C56829E20648}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{52B2B291-EF40-4436-BA3E-C56829E20648}.Debug|x86.Build.0 = Debug|Any CPU
+		{52B2B291-EF40-4436-BA3E-C56829E20648}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{52B2B291-EF40-4436-BA3E-C56829E20648}.Release|Any CPU.Build.0 = Release|Any CPU
+		{52B2B291-EF40-4436-BA3E-C56829E20648}.Release|x64.ActiveCfg = Release|Any CPU
+		{52B2B291-EF40-4436-BA3E-C56829E20648}.Release|x64.Build.0 = Release|Any CPU
+		{52B2B291-EF40-4436-BA3E-C56829E20648}.Release|x86.ActiveCfg = Release|Any CPU
+		{52B2B291-EF40-4436-BA3E-C56829E20648}.Release|x86.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{74C9B4A3-9F4C-4A93-A8DB-C25CFB4FD812} = {25D937ED-E266-4BE8-9587-D16957520539}
@@ -70,5 +140,6 @@ Global
 		{E5EB7514-ED99-49C6-852B-97429FC8A88D} = {25D937ED-E266-4BE8-9587-D16957520539}
 		{3BB41B82-845F-4438-B38B-CB5CD37D42C4} = {25D937ED-E266-4BE8-9587-D16957520539}
 		{B9E0F05A-2122-459B-9A89-E2618F7173E5} = {25D937ED-E266-4BE8-9587-D16957520539}
+		{52B2B291-EF40-4436-BA3E-C56829E20648} = {3A5910AE-16FB-0E4A-CB83-F683AD5A17DE}
 	EndGlobalSection
 EndGlobal
diff --git a/src/MonitoringSolutions/MonitoringSolutions/Az.MonitoringSolutions.psd1 b/src/MonitoringSolutions/MonitoringSolutions/Az.MonitoringSolutions.psd1
index c2e368d4d645..4e6a8b0e219e 100644
--- a/src/MonitoringSolutions/MonitoringSolutions/Az.MonitoringSolutions.psd1
+++ b/src/MonitoringSolutions/MonitoringSolutions/Az.MonitoringSolutions.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Microsoft Corporation
 #
-# Generated on: 1/9/2025
+# Generated on: 4/15/2025
 #
 
 @{
@@ -51,21 +51,21 @@ DotNetFrameworkVersion = '4.7.2'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '4.0.1'; })
+RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '4.1.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 
                'MonitoringSolutions.Autorest/bin/Az.MonitoringSolutions.private.dll'
 
 # Script files (.ps1) that are run in the caller's environment prior to importing this module.
-# ScriptsToProcess = @()
+ScriptsToProcess = @()
 
 # Type files (.ps1xml) to be loaded when importing this module
-# TypesToProcess = @()
+TypesToProcess = @()
 
 # Format files (.ps1xml) to be loaded when importing this module
 FormatsToProcess = 
-               'MonitoringSolutions.Autorest\Az.MonitoringSolutions.format.ps1xml'
+               'MonitoringSolutions.Autorest/Az.MonitoringSolutions.format.ps1xml'
 
 # Modules to import as nested modules of the module specified in RootModule/ModuleToProcess
 NestedModules = @('MonitoringSolutions.Autorest/Az.MonitoringSolutions.psm1')
@@ -100,7 +100,7 @@ PrivateData = @{
     PSData = @{
 
         # Tags applied to this module. These help with module discovery in online galleries.
-        Tags = 'Azure','ResourceManager','ARM','PSModule','MonitoringSolutions'
+        Tags = 'Azure', 'ResourceManager', 'ARM', 'PSModule', 'MonitoringSolutions'
 
         # A URL to the license for this module.
         LicenseUri = 'https://aka.ms/azps-license'
@@ -125,7 +125,7 @@ PrivateData = @{
 
     } # End of PSData hashtable
 
- } # End of PrivateData hashtable
+} # End of PrivateData hashtable
 
 # HelpInfo URI of this module
 # HelpInfoURI = ''
diff --git a/src/MonitoringSolutions/MonitoringSolutions/ChangeLog.md b/src/MonitoringSolutions/MonitoringSolutions/ChangeLog.md
index 292a5985d318..5eca45a17d78 100644
--- a/src/MonitoringSolutions/MonitoringSolutions/ChangeLog.md
+++ b/src/MonitoringSolutions/MonitoringSolutions/ChangeLog.md
@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Introduced various new features by upgrading code generator. Please see details [here](https://github.com/Azure/azure-powershell/blob/main/documentation/Autorest-powershell-v4-new-features.md).
 
 ## Version 0.1.2
 * Upgraded nuget package to signed package.
diff --git a/src/MonitoringSolutions/MonitoringSolutions/help/Az.MonitoringSolutions.md b/src/MonitoringSolutions/MonitoringSolutions/help/Az.MonitoringSolutions.md
index c38c4d472a76..583b31c1f85b 100644
--- a/src/MonitoringSolutions/MonitoringSolutions/help/Az.MonitoringSolutions.md
+++ b/src/MonitoringSolutions/MonitoringSolutions/help/Az.MonitoringSolutions.md
@@ -21,5 +21,5 @@ Creates a log analytics solution.
 Deletes the solution in the subscription.
 
 ### [Update-AzMonitorLogAnalyticsSolution](Update-AzMonitorLogAnalyticsSolution.md)
-Update the tags of a solution.
+update the tags of a solution.
 
diff --git a/src/MonitoringSolutions/MonitoringSolutions/help/Get-AzMonitorLogAnalyticsSolution.md b/src/MonitoringSolutions/MonitoringSolutions/help/Get-AzMonitorLogAnalyticsSolution.md
index 6ac59523475c..a605c694e337 100644
--- a/src/MonitoringSolutions/MonitoringSolutions/help/Get-AzMonitorLogAnalyticsSolution.md
+++ b/src/MonitoringSolutions/MonitoringSolutions/help/Get-AzMonitorLogAnalyticsSolution.md
@@ -128,7 +128,6 @@ Accept wildcard characters: False
 
 ### -InputObject
 Identity Parameter
-To construct, see NOTES section for INPUTOBJECT properties and create a hash table.
 
 ```yaml
 Type: Microsoft.Azure.PowerShell.Cmdlets.MonitoringSolutions.Models.IMonitoringSolutionsIdentity
@@ -198,7 +197,9 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 
 ## OUTPUTS
 
-### Microsoft.Azure.PowerShell.Cmdlets.MonitoringSolutions.Models.Api20151101Preview.ISolution
+### Microsoft.Azure.PowerShell.Cmdlets.MonitoringSolutions.Models.ISolution
+
+### Microsoft.Azure.PowerShell.Cmdlets.MonitoringSolutions.Models.ISolutionPropertiesList
 
 ## NOTES
 
diff --git a/src/MonitoringSolutions/MonitoringSolutions/help/New-AzMonitorLogAnalyticsSolution.md b/src/MonitoringSolutions/MonitoringSolutions/help/New-AzMonitorLogAnalyticsSolution.md
index 9a625aea1089..e2dd9480fda7 100644
--- a/src/MonitoringSolutions/MonitoringSolutions/help/New-AzMonitorLogAnalyticsSolution.md
+++ b/src/MonitoringSolutions/MonitoringSolutions/help/New-AzMonitorLogAnalyticsSolution.md
@@ -61,7 +61,8 @@ Commonly used types are:
 ## PARAMETERS
 
 ### -DefaultProfile
-The credentials, account, tenant, and subscription used for communication with Azure.
+The DefaultProfile parameter is not functional.
+Use the SubscriptionId parameter when available if executing the cmdlet against a different subscription.
 
 ```yaml
 Type: System.Management.Automation.PSObject
@@ -205,12 +206,12 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 
 ## INPUTS
 
+### Microsoft.Azure.PowerShell.Cmdlets.MonitoringSolutions.Models.IMonitoringSolutionsIdentity
+
 ## OUTPUTS
 
-### Microsoft.Azure.PowerShell.Cmdlets.MonitoringSolutions.Models.Api20151101Preview.ISolution
+### Microsoft.Azure.PowerShell.Cmdlets.MonitoringSolutions.Models.ISolution
 
 ## NOTES
 
 ## RELATED LINKS
-
-[Get-AzOperationalInsightsWorkspace](https://learn.microsoft.com/powershell/module/az.operationalinsights/get-azoperationalinsightsworkspace)
diff --git a/src/MonitoringSolutions/MonitoringSolutions/help/Remove-AzMonitorLogAnalyticsSolution.md b/src/MonitoringSolutions/MonitoringSolutions/help/Remove-AzMonitorLogAnalyticsSolution.md
index 53dcd5c77363..4072d07fc8da 100644
--- a/src/MonitoringSolutions/MonitoringSolutions/help/Remove-AzMonitorLogAnalyticsSolution.md
+++ b/src/MonitoringSolutions/MonitoringSolutions/help/Remove-AzMonitorLogAnalyticsSolution.md
@@ -72,7 +72,6 @@ Accept wildcard characters: False
 
 ### -InputObject
 Identity Parameter
-To construct, see NOTES section for INPUTOBJECT properties and create a hash table.
 
 ```yaml
 Type: Microsoft.Azure.PowerShell.Cmdlets.MonitoringSolutions.Models.IMonitoringSolutionsIdentity
diff --git a/src/MonitoringSolutions/MonitoringSolutions/help/Update-AzMonitorLogAnalyticsSolution.md b/src/MonitoringSolutions/MonitoringSolutions/help/Update-AzMonitorLogAnalyticsSolution.md
index 74b521dd64d1..5ace40914b24 100644
--- a/src/MonitoringSolutions/MonitoringSolutions/help/Update-AzMonitorLogAnalyticsSolution.md
+++ b/src/MonitoringSolutions/MonitoringSolutions/help/Update-AzMonitorLogAnalyticsSolution.md
@@ -8,7 +8,7 @@ schema: 2.0.0
 # Update-AzMonitorLogAnalyticsSolution
 
 ## SYNOPSIS
-Update the tags of a solution.
+update the tags of a solution.
 
 ## SYNTAX
 
@@ -26,7 +26,7 @@ Update-AzMonitorLogAnalyticsSolution -InputObject <IMonitoringSolutionsIdentity>
 ```
 
 ## DESCRIPTION
-Update the tags of a solution.
+update the tags of a solution.
 
 ## EXAMPLES
 
@@ -77,7 +77,6 @@ Accept wildcard characters: False
 
 ### -InputObject
 Identity Parameter
-To construct, see NOTES section for INPUTOBJECT properties and create a hash table.
 
 ```yaml
 Type: Microsoft.Azure.PowerShell.Cmdlets.MonitoringSolutions.Models.IMonitoringSolutionsIdentity
@@ -193,7 +192,7 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 
 ## OUTPUTS
 
-### Microsoft.Azure.PowerShell.Cmdlets.MonitoringSolutions.Models.Api20151101Preview.ISolution
+### Microsoft.Azure.PowerShell.Cmdlets.MonitoringSolutions.Models.ISolution
 
 ## NOTES