diff --git a/samples/AzureSample.ResourceManager.Sample/src/Generated/Models/AzureSampleResourceManagerSampleContext.cs b/samples/AzureSample.ResourceManager.Sample/src/Generated/Models/AzureSampleResourceManagerSampleContext.cs
index 9fd62cef858..dbbe294595d 100644
--- a/samples/AzureSample.ResourceManager.Sample/src/Generated/Models/AzureSampleResourceManagerSampleContext.cs
+++ b/samples/AzureSample.ResourceManager.Sample/src/Generated/Models/AzureSampleResourceManagerSampleContext.cs
@@ -16,10 +16,12 @@ namespace AzureSample.ResourceManager.Sample
     /// 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'
     /// </summary>
+    [ModelReaderWriterBuildable(typeof(AdditionalCapabilities))]
     [ModelReaderWriterBuildable(typeof(AdditionalUnattendContent))]
     [ModelReaderWriterBuildable(typeof(ApiError))]
     [ModelReaderWriterBuildable(typeof(ApiErrorBase))]
     [ModelReaderWriterBuildable(typeof(AutomaticOSUpgradePolicy))]
+    [ModelReaderWriterBuildable(typeof(AutomaticOSUpgradeProperties))]
     [ModelReaderWriterBuildable(typeof(AutomaticRepairsPolicy))]
     [ModelReaderWriterBuildable(typeof(AvailabilitySetData))]
     [ModelReaderWriterBuildable(typeof(AvailabilitySetListResult))]
@@ -30,13 +32,16 @@ namespace AzureSample.ResourceManager.Sample
     [ModelReaderWriterBuildable(typeof(AzureSampleResourceManagerSampleSku))]
     [ModelReaderWriterBuildable(typeof(AzureSampleResourceManagerSampleUsage))]
     [ModelReaderWriterBuildable(typeof(AzureSampleResourceManagerSampleUsageName))]
+    [ModelReaderWriterBuildable(typeof(BillingProfile))]
     [ModelReaderWriterBuildable(typeof(BootDiagnostics))]
     [ModelReaderWriterBuildable(typeof(BootDiagnosticsInstanceView))]
     [ModelReaderWriterBuildable(typeof(DataDisk))]
     [ModelReaderWriterBuildable(typeof(DataDiskImage))]
     [ModelReaderWriterBuildable(typeof(DedicatedHostAllocatableVm))]
+    [ModelReaderWriterBuildable(typeof(DedicatedHostAvailableCapacity))]
     [ModelReaderWriterBuildable(typeof(DedicatedHostData))]
     [ModelReaderWriterBuildable(typeof(DedicatedHostGroupData))]
+    [ModelReaderWriterBuildable(typeof(DedicatedHostGroupInstanceView))]
     [ModelReaderWriterBuildable(typeof(DedicatedHostGroupListResult))]
     [ModelReaderWriterBuildable(typeof(DedicatedHostGroupPatch))]
     [ModelReaderWriterBuildable(typeof(DedicatedHostGroupResource))]
@@ -45,10 +50,13 @@ namespace AzureSample.ResourceManager.Sample
     [ModelReaderWriterBuildable(typeof(DedicatedHostListResult))]
     [ModelReaderWriterBuildable(typeof(DedicatedHostPatch))]
     [ModelReaderWriterBuildable(typeof(DedicatedHostResource))]
+    [ModelReaderWriterBuildable(typeof(DiagnosticsProfile))]
     [ModelReaderWriterBuildable(typeof(DiffDiskSettings))]
+    [ModelReaderWriterBuildable(typeof(DisallowedConfiguration))]
     [ModelReaderWriterBuildable(typeof(DiskEncryptionSettings))]
     [ModelReaderWriterBuildable(typeof(DiskInstanceView))]
     [ModelReaderWriterBuildable(typeof(ExtendedLocation))]
+    [ModelReaderWriterBuildable(typeof(HardwareProfile))]
     [ModelReaderWriterBuildable(typeof(ImageData))]
     [ModelReaderWriterBuildable(typeof(ImageDataDisk))]
     [ModelReaderWriterBuildable(typeof(ImageDisk))]
@@ -67,14 +75,18 @@ namespace AzureSample.ResourceManager.Sample
     [ModelReaderWriterBuildable(typeof(ListUsagesResult))]
     [ModelReaderWriterBuildable(typeof(LogAnalytics))]
     [ModelReaderWriterBuildable(typeof(LogAnalyticsInputBase))]
+    [ModelReaderWriterBuildable(typeof(LogAnalyticsOutput))]
     [ModelReaderWriterBuildable(typeof(MaintenanceRedeployStatus))]
     [ModelReaderWriterBuildable(typeof(ManagedDiskParameters))]
     [ModelReaderWriterBuildable(typeof(ManagedServiceIdentity))]
     [ModelReaderWriterBuildable(typeof(NetworkInterfaceReference))]
+    [ModelReaderWriterBuildable(typeof(NetworkProfile))]
     [ModelReaderWriterBuildable(typeof(OrchestrationServiceStateContent))]
     [ModelReaderWriterBuildable(typeof(OrchestrationServiceSummary))]
     [ModelReaderWriterBuildable(typeof(OSDisk))]
+    [ModelReaderWriterBuildable(typeof(OSDiskImage))]
     [ModelReaderWriterBuildable(typeof(OSProfile))]
+    [ModelReaderWriterBuildable(typeof(PatchSettings))]
     [ModelReaderWriterBuildable(typeof(ProximityPlacementGroupData))]
     [ModelReaderWriterBuildable(typeof(ProximityPlacementGroupListResult))]
     [ModelReaderWriterBuildable(typeof(ProximityPlacementGroupPatch))]
@@ -87,6 +99,10 @@ namespace AzureSample.ResourceManager.Sample
     [ModelReaderWriterBuildable(typeof(RollingUpgradePolicy))]
     [ModelReaderWriterBuildable(typeof(RollingUpgradeProgressInfo))]
     [ModelReaderWriterBuildable(typeof(RollingUpgradeRunningStatus))]
+    [ModelReaderWriterBuildable(typeof(ScaleInPolicy))]
+    [ModelReaderWriterBuildable(typeof(ScheduledEventsProfile))]
+    [ModelReaderWriterBuildable(typeof(SecurityProfile))]
+    [ModelReaderWriterBuildable(typeof(SshConfiguration))]
     [ModelReaderWriterBuildable(typeof(SshPublicKeyData))]
     [ModelReaderWriterBuildable(typeof(SshPublicKeyGenerateKeyPairResult))]
     [ModelReaderWriterBuildable(typeof(SshPublicKeyInfo))]
@@ -110,6 +126,7 @@ namespace AzureSample.ResourceManager.Sample
     [ModelReaderWriterBuildable(typeof(UserAssignedIdentity))]
     [ModelReaderWriterBuildable(typeof(VaultCertificate))]
     [ModelReaderWriterBuildable(typeof(VaultSecretGroup))]
+    [ModelReaderWriterBuildable(typeof(VirtualHardDisk))]
     [ModelReaderWriterBuildable(typeof(VirtualMachineAgentInstanceView))]
     [ModelReaderWriterBuildable(typeof(VirtualMachineAssessPatchesResult))]
     [ModelReaderWriterBuildable(typeof(VirtualMachineCaptureContent))]
@@ -121,7 +138,9 @@ namespace AzureSample.ResourceManager.Sample
     [ModelReaderWriterBuildable(typeof(VirtualMachineExtensionImageResource))]
     [ModelReaderWriterBuildable(typeof(VirtualMachineExtensionInstanceView))]
     [ModelReaderWriterBuildable(typeof(VirtualMachineExtensionResource))]
+    [ModelReaderWriterBuildable(typeof(VirtualMachineExtensionsListResult))]
     [ModelReaderWriterBuildable(typeof(VirtualMachineExtensionUpdate))]
+    [ModelReaderWriterBuildable(typeof(VirtualMachineHealthStatus))]
     [ModelReaderWriterBuildable(typeof(VirtualMachineImage))]
     [ModelReaderWriterBuildable(typeof(VirtualMachineImageResource))]
     [ModelReaderWriterBuildable(typeof(VirtualMachineInstanceView))]
@@ -138,6 +157,7 @@ namespace AzureSample.ResourceManager.Sample
     [ModelReaderWriterBuildable(typeof(VirtualMachineScaleSetExtensionProfile))]
     [ModelReaderWriterBuildable(typeof(VirtualMachineScaleSetExtensionResource))]
     [ModelReaderWriterBuildable(typeof(VirtualMachineScaleSetInstanceView))]
+    [ModelReaderWriterBuildable(typeof(VirtualMachineScaleSetInstanceViewStatusesSummary))]
     [ModelReaderWriterBuildable(typeof(VirtualMachineScaleSetIPConfiguration))]
     [ModelReaderWriterBuildable(typeof(VirtualMachineScaleSetIPTag))]
     [ModelReaderWriterBuildable(typeof(VirtualMachineScaleSetListOSUpgradeHistory))]
@@ -146,11 +166,13 @@ namespace AzureSample.ResourceManager.Sample
     [ModelReaderWriterBuildable(typeof(VirtualMachineScaleSetListWithLinkResult))]
     [ModelReaderWriterBuildable(typeof(VirtualMachineScaleSetManagedDiskParameters))]
     [ModelReaderWriterBuildable(typeof(VirtualMachineScaleSetNetworkConfiguration))]
+    [ModelReaderWriterBuildable(typeof(VirtualMachineScaleSetNetworkConfigurationDnsSettings))]
     [ModelReaderWriterBuildable(typeof(VirtualMachineScaleSetNetworkProfile))]
     [ModelReaderWriterBuildable(typeof(VirtualMachineScaleSetOSDisk))]
     [ModelReaderWriterBuildable(typeof(VirtualMachineScaleSetOSProfile))]
     [ModelReaderWriterBuildable(typeof(VirtualMachineScaleSetPatch))]
     [ModelReaderWriterBuildable(typeof(VirtualMachineScaleSetPublicIPAddressConfiguration))]
+    [ModelReaderWriterBuildable(typeof(VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings))]
     [ModelReaderWriterBuildable(typeof(VirtualMachineScaleSetReimageContent))]
     [ModelReaderWriterBuildable(typeof(VirtualMachineScaleSetResource))]
     [ModelReaderWriterBuildable(typeof(VirtualMachineScaleSetRollingUpgradeData))]
@@ -173,6 +195,7 @@ namespace AzureSample.ResourceManager.Sample
     [ModelReaderWriterBuildable(typeof(VirtualMachineScaleSetVmInstanceRequiredIds))]
     [ModelReaderWriterBuildable(typeof(VirtualMachineScaleSetVmInstanceView))]
     [ModelReaderWriterBuildable(typeof(VirtualMachineScaleSetVmListResult))]
+    [ModelReaderWriterBuildable(typeof(VirtualMachineScaleSetVmNetworkProfileConfiguration))]
     [ModelReaderWriterBuildable(typeof(VirtualMachineScaleSetVmProfile))]
     [ModelReaderWriterBuildable(typeof(VirtualMachineScaleSetVmProtectionPolicy))]
     [ModelReaderWriterBuildable(typeof(VirtualMachineScaleSetVmReimageContent))]
@@ -183,6 +206,7 @@ namespace AzureSample.ResourceManager.Sample
     [ModelReaderWriterBuildable(typeof(VirtualMachineStatusCodeCount))]
     [ModelReaderWriterBuildable(typeof(VmScaleSetConvertToSinglePlacementGroupContent))]
     [ModelReaderWriterBuildable(typeof(WindowsConfiguration))]
+    [ModelReaderWriterBuildable(typeof(WinRMConfiguration))]
     [ModelReaderWriterBuildable(typeof(WinRMListener))]
     [ModelReaderWriterBuildable(typeof(WritableSubResource))]
     public partial class AzureSampleResourceManagerSampleContext : ModelReaderWriterContext
diff --git a/src/AutoRest.CSharp/Common/Output/PostProcessing/PostProcessor.cs b/src/AutoRest.CSharp/Common/Output/PostProcessing/PostProcessor.cs
index 6f232b28b1c..546def32477 100644
--- a/src/AutoRest.CSharp/Common/Output/PostProcessing/PostProcessor.cs
+++ b/src/AutoRest.CSharp/Common/Output/PostProcessing/PostProcessor.cs
@@ -144,7 +144,6 @@ public async Task<Project> InternalizeAsync(Project project)
         var modelNamesToRemove = nodesToInternalize.Keys.Select(item => item.Identifier.Text).Concat(suppressedTypeNames);
         var modelFullNamesToRemove = nodesToInternalize.Keys.Select(item => GetFullName(item)).ToHashSet();
         project = await RemoveMethodsFromModelFactoryAsync(project, definitions, modelNamesToRemove.ToHashSet());
-        project = await RemoveAttributesFromModelRreaderWriterContext(project, modelFullNamesToRemove);
 
         return project;
 
@@ -159,68 +158,6 @@ string GetFullName(BaseTypeDeclarationSyntax item)
         }
     }
 
-    private async Task<Project> RemoveAttributesFromModelRreaderWriterContext(Project project, HashSet<string> namesToRemove)
-    {
-        if (_mrwContextTypeSymbol is null)
-        {
-            return project;
-        }
-
-        var updatedAttributeLists = new List<AttributeListSyntax>();
-        var mrwContextClassNode = _mrwContextTypeSymbol.DeclaringSyntaxReferences.FirstOrDefault()?.GetSyntax() as ClassDeclarationSyntax;
-        if (mrwContextClassNode is null)
-        {
-            return project;
-        }
-
-        var root = await mrwContextClassNode.SyntaxTree.GetRootAsync();
-        var updated = false;
-        foreach (var attributeList in mrwContextClassNode!.AttributeLists)
-        {
-            var updatedAttributes = new List<AttributeSyntax>();
-            foreach (var attribute in attributeList.Attributes)
-            {
-                if (!ShouldRemoveAttribute(attribute))
-                {
-                    updatedAttributes.Add(attribute);
-                }
-            }
-
-            if (updatedAttributes.Count != attributeList.Attributes.Count)
-            {
-                updated = true;
-                if (updatedAttributes.Count == 0)
-                {
-                    continue; // skip empty attribute lists
-                }
-                updatedAttributeLists.Add(SyntaxFactory.AttributeList(SyntaxFactory.SeparatedList(updatedAttributes)));
-            }
-            else
-            {
-                updatedAttributeLists.Add(attributeList);
-            }
-        }
-
-        if (updated)
-        {
-            var leadingTrivia = mrwContextClassNode.GetLeadingTrivia();
-            var newClassNode = mrwContextClassNode.WithAttributeLists(SyntaxFactory.List(updatedAttributeLists)).WithLeadingTrivia(leadingTrivia);
-            var newRoot = root.ReplaceNode(mrwContextClassNode, newClassNode);
-
-            var mrwContextDocument = project.GetDocument(mrwContextClassNode.SyntaxTree)!;
-            mrwContextDocument = mrwContextDocument.WithSyntaxRoot(newRoot);
-            return mrwContextDocument.Project;
-        }
-
-        return project;
-
-        bool ShouldRemoveAttribute(AttributeSyntax attr)
-        {
-            var attributeArgumentNames = attr.ArgumentList?.Arguments.Select(x => ((x.Expression as TypeOfExpressionSyntax)?.Type as QualifiedNameSyntax)?.ToString());
-            return attributeArgumentNames != null && attributeArgumentNames.Any(name => name is not null && namesToRemove.Contains(name));
-        }
-    }
-
     private async Task<Project> RemoveMethodsFromModelFactoryAsync(Project project, TypeSymbols definitions, HashSet<string> namesToRemove)
     {
         var modelFactorySymbol = definitions.ModelFactorySymbol;
diff --git a/test/CadlRanchProjects/azure/client-generator-core/access/src/Generated/Models/_Specs_AzureClientGeneratorCoreAccessContext.cs b/test/CadlRanchProjects/azure/client-generator-core/access/src/Generated/Models/_Specs_AzureClientGeneratorCoreAccessContext.cs
index 07d067aa730..c5e181fbf1a 100644
--- a/test/CadlRanchProjects/azure/client-generator-core/access/src/Generated/Models/_Specs_AzureClientGeneratorCoreAccessContext.cs
+++ b/test/CadlRanchProjects/azure/client-generator-core/access/src/Generated/Models/_Specs_AzureClientGeneratorCoreAccessContext.cs
@@ -14,10 +14,16 @@ namespace _Specs_.Azure.ClientGenerator.Core.Access
     /// 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'
     /// </summary>
+    [ModelReaderWriterBuildable(typeof(AbstractModel))]
+    [ModelReaderWriterBuildable(typeof(BaseModel))]
+    [ModelReaderWriterBuildable(typeof(InnerModel))]
     [ModelReaderWriterBuildable(typeof(InternalDecoratorModelInInternal))]
+    [ModelReaderWriterBuildable(typeof(NoDecoratorModelInInternal))]
     [ModelReaderWriterBuildable(typeof(NoDecoratorModelInPublic))]
+    [ModelReaderWriterBuildable(typeof(OuterModel))]
     [ModelReaderWriterBuildable(typeof(PublicDecoratorModelInInternal))]
     [ModelReaderWriterBuildable(typeof(PublicDecoratorModelInPublic))]
+    [ModelReaderWriterBuildable(typeof(RealModel))]
     [ModelReaderWriterBuildable(typeof(SharedModel))]
     [ModelReaderWriterBuildable(typeof(UnknownAbstractModel))]
     public partial class _Specs_AzureClientGeneratorCoreAccessContext : ModelReaderWriterContext
diff --git a/test/CadlRanchProjects/azure/resource-manager/common-properties/src/Generated/Models/_AzureResourceManagerCommonPropertiesContext.cs b/test/CadlRanchProjects/azure/resource-manager/common-properties/src/Generated/Models/_AzureResourceManagerCommonPropertiesContext.cs
index 7809bbf7b2e..8cfd3ebab03 100644
--- a/test/CadlRanchProjects/azure/resource-manager/common-properties/src/Generated/Models/_AzureResourceManagerCommonPropertiesContext.cs
+++ b/test/CadlRanchProjects/azure/resource-manager/common-properties/src/Generated/Models/_AzureResourceManagerCommonPropertiesContext.cs
@@ -21,6 +21,7 @@ namespace _Azure.ResourceManager.CommonProperties
     [ModelReaderWriterBuildable(typeof(ConfidentialResourceProperties))]
     [ModelReaderWriterBuildable(typeof(ManagedIdentityTrackedResource))]
     [ModelReaderWriterBuildable(typeof(ManagedIdentityTrackedResourceData))]
+    [ModelReaderWriterBuildable(typeof(ManagedIdentityTrackedResourceProperties))]
     [ModelReaderWriterBuildable(typeof(ManagedServiceIdentity))]
     [ModelReaderWriterBuildable(typeof(ResponseError))]
     [ModelReaderWriterBuildable(typeof(SystemData))]
diff --git a/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Models/_AzureResourceManagerResourcesContext.cs b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Models/_AzureResourceManagerResourcesContext.cs
index 2c2bbf76564..e4b97e6d5cc 100644
--- a/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Models/_AzureResourceManagerResourcesContext.cs
+++ b/test/CadlRanchProjects/azure/resource-manager/resources/src/Generated/Models/_AzureResourceManagerResourcesContext.cs
@@ -18,21 +18,26 @@ namespace _Azure.ResourceManager.Resources
     /// </summary>
     [ModelReaderWriterBuildable(typeof(ExtensionsResource))]
     [ModelReaderWriterBuildable(typeof(ExtensionsResourceData))]
+    [ModelReaderWriterBuildable(typeof(ExtensionsResourceListResult))]
     [ModelReaderWriterBuildable(typeof(ExtensionsResourceProperties))]
     [ModelReaderWriterBuildable(typeof(LocationResource))]
     [ModelReaderWriterBuildable(typeof(LocationResourceData))]
+    [ModelReaderWriterBuildable(typeof(LocationResourceListResult))]
     [ModelReaderWriterBuildable(typeof(LocationResourceProperties))]
     [ModelReaderWriterBuildable(typeof(NestedProxyResource))]
     [ModelReaderWriterBuildable(typeof(NestedProxyResourceData))]
+    [ModelReaderWriterBuildable(typeof(NestedProxyResourceListResult))]
     [ModelReaderWriterBuildable(typeof(NestedProxyResourceProperties))]
     [ModelReaderWriterBuildable(typeof(NotificationDetails))]
     [ModelReaderWriterBuildable(typeof(ResponseError))]
     [ModelReaderWriterBuildable(typeof(SingletonTrackedResource))]
     [ModelReaderWriterBuildable(typeof(SingletonTrackedResourceData))]
+    [ModelReaderWriterBuildable(typeof(SingletonTrackedResourceListResult))]
     [ModelReaderWriterBuildable(typeof(SingletonTrackedResourceProperties))]
     [ModelReaderWriterBuildable(typeof(SystemData))]
     [ModelReaderWriterBuildable(typeof(TopLevelTrackedResource))]
     [ModelReaderWriterBuildable(typeof(TopLevelTrackedResourceData))]
+    [ModelReaderWriterBuildable(typeof(TopLevelTrackedResourceListResult))]
     [ModelReaderWriterBuildable(typeof(TopLevelTrackedResourceProperties))]
     public partial class _AzureResourceManagerResourcesContext : ModelReaderWriterContext
     {
diff --git a/test/CadlRanchProjects/parameters/basic/src/Generated/Models/ParametersBasicContext.cs b/test/CadlRanchProjects/parameters/basic/src/Generated/Models/ParametersBasicContext.cs
index 68b8ed422a9..ceddb04caec 100644
--- a/test/CadlRanchProjects/parameters/basic/src/Generated/Models/ParametersBasicContext.cs
+++ b/test/CadlRanchProjects/parameters/basic/src/Generated/Models/ParametersBasicContext.cs
@@ -14,6 +14,7 @@ namespace Parameters.Basic
     /// 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'
     /// </summary>
+    [ModelReaderWriterBuildable(typeof(SimpleRequest))]
     [ModelReaderWriterBuildable(typeof(User))]
     public partial class ParametersBasicContext : ModelReaderWriterContext
     {
diff --git a/test/CadlRanchProjects/parameters/spread/src/Generated/Models/ParametersSpreadContext.cs b/test/CadlRanchProjects/parameters/spread/src/Generated/Models/ParametersSpreadContext.cs
index f0554bf3fe1..b77d45c712c 100644
--- a/test/CadlRanchProjects/parameters/spread/src/Generated/Models/ParametersSpreadContext.cs
+++ b/test/CadlRanchProjects/parameters/spread/src/Generated/Models/ParametersSpreadContext.cs
@@ -15,6 +15,12 @@ namespace Parameters.Spread
     /// For more information see 'https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/System.ClientModel/src/docs/ModelReaderWriterContext.md'
     /// </summary>
     [ModelReaderWriterBuildable(typeof(BodyParameter))]
+    [ModelReaderWriterBuildable(typeof(SpreadAsRequestBodyRequest))]
+    [ModelReaderWriterBuildable(typeof(SpreadAsRequestParameterRequest))]
+    [ModelReaderWriterBuildable(typeof(SpreadCompositeRequestMixRequest))]
+    [ModelReaderWriterBuildable(typeof(SpreadParameterWithInnerAliasRequest))]
+    [ModelReaderWriterBuildable(typeof(SpreadParameterWithInnerModelRequest))]
+    [ModelReaderWriterBuildable(typeof(SpreadWithMultipleParametersRequest))]
     public partial class ParametersSpreadContext : ModelReaderWriterContext
     {
     }
diff --git a/test/CadlRanchProjects/type/union/src/Generated/Models/_TypeUnionContext.cs b/test/CadlRanchProjects/type/union/src/Generated/Models/_TypeUnionContext.cs
index 14423cb7a7b..b96a3ae4f49 100644
--- a/test/CadlRanchProjects/type/union/src/Generated/Models/_TypeUnionContext.cs
+++ b/test/CadlRanchProjects/type/union/src/Generated/Models/_TypeUnionContext.cs
@@ -29,6 +29,16 @@ namespace _Type.Union
     [ModelReaderWriterBuildable(typeof(GetResponse9))]
     [ModelReaderWriterBuildable(typeof(MixedLiteralsCases))]
     [ModelReaderWriterBuildable(typeof(MixedTypesCases))]
+    [ModelReaderWriterBuildable(typeof(SendRequest))]
+    [ModelReaderWriterBuildable(typeof(SendRequest1))]
+    [ModelReaderWriterBuildable(typeof(SendRequest2))]
+    [ModelReaderWriterBuildable(typeof(SendRequest3))]
+    [ModelReaderWriterBuildable(typeof(SendRequest4))]
+    [ModelReaderWriterBuildable(typeof(SendRequest5))]
+    [ModelReaderWriterBuildable(typeof(SendRequest6))]
+    [ModelReaderWriterBuildable(typeof(SendRequest7))]
+    [ModelReaderWriterBuildable(typeof(SendRequest8))]
+    [ModelReaderWriterBuildable(typeof(SendRequest9))]
     [ModelReaderWriterBuildable(typeof(StringAndArrayCases))]
     public partial class _TypeUnionContext : ModelReaderWriterContext
     {
diff --git a/test/CadlRanchProjectsNonAzure/parameters/spread/src/Generated/Models/ScmParametersSpreadContext.cs b/test/CadlRanchProjectsNonAzure/parameters/spread/src/Generated/Models/ScmParametersSpreadContext.cs
index 8f51b090048..f2879cfe23a 100644
--- a/test/CadlRanchProjectsNonAzure/parameters/spread/src/Generated/Models/ScmParametersSpreadContext.cs
+++ b/test/CadlRanchProjectsNonAzure/parameters/spread/src/Generated/Models/ScmParametersSpreadContext.cs
@@ -12,6 +12,12 @@ namespace Scm.Parameters.Spread
     /// For more information see 'https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/System.ClientModel/src/docs/ModelReaderWriterContext.md'
     /// </summary>
     [ModelReaderWriterBuildable(typeof(BodyParameter))]
+    [ModelReaderWriterBuildable(typeof(SpreadAsRequestBodyRequest))]
+    [ModelReaderWriterBuildable(typeof(SpreadAsRequestParameterRequest))]
+    [ModelReaderWriterBuildable(typeof(SpreadCompositeRequestMixRequest))]
+    [ModelReaderWriterBuildable(typeof(SpreadParameterWithInnerAliasRequest))]
+    [ModelReaderWriterBuildable(typeof(SpreadParameterWithInnerModelRequest))]
+    [ModelReaderWriterBuildable(typeof(SpreadWithMultipleParametersRequest))]
     public partial class ScmParametersSpreadContext : ModelReaderWriterContext
     {
     }
diff --git a/test/CadlRanchProjectsNonAzure/type/union/src/Generated/Models/Scm_TypeUnionContext.cs b/test/CadlRanchProjectsNonAzure/type/union/src/Generated/Models/Scm_TypeUnionContext.cs
index f78fbd7a216..a17d6742f9b 100644
--- a/test/CadlRanchProjectsNonAzure/type/union/src/Generated/Models/Scm_TypeUnionContext.cs
+++ b/test/CadlRanchProjectsNonAzure/type/union/src/Generated/Models/Scm_TypeUnionContext.cs
@@ -26,6 +26,16 @@ namespace Scm._Type.Union
     [ModelReaderWriterBuildable(typeof(GetResponse9))]
     [ModelReaderWriterBuildable(typeof(MixedLiteralsCases))]
     [ModelReaderWriterBuildable(typeof(MixedTypesCases))]
+    [ModelReaderWriterBuildable(typeof(SendRequest))]
+    [ModelReaderWriterBuildable(typeof(SendRequest1))]
+    [ModelReaderWriterBuildable(typeof(SendRequest2))]
+    [ModelReaderWriterBuildable(typeof(SendRequest3))]
+    [ModelReaderWriterBuildable(typeof(SendRequest4))]
+    [ModelReaderWriterBuildable(typeof(SendRequest5))]
+    [ModelReaderWriterBuildable(typeof(SendRequest6))]
+    [ModelReaderWriterBuildable(typeof(SendRequest7))]
+    [ModelReaderWriterBuildable(typeof(SendRequest8))]
+    [ModelReaderWriterBuildable(typeof(SendRequest9))]
     [ModelReaderWriterBuildable(typeof(StringAndArrayCases))]
     public partial class Scm_TypeUnionContext : ModelReaderWriterContext
     {
diff --git a/test/TestProjects/MgmtCustomizations/src/Generated/Models/MgmtCustomizationsContext.cs b/test/TestProjects/MgmtCustomizations/src/Generated/Models/MgmtCustomizationsContext.cs
index 8e075f75b6a..1e29ac3926d 100644
--- a/test/TestProjects/MgmtCustomizations/src/Generated/Models/MgmtCustomizationsContext.cs
+++ b/test/TestProjects/MgmtCustomizations/src/Generated/Models/MgmtCustomizationsContext.cs
@@ -20,6 +20,7 @@ namespace MgmtCustomizations
     [ModelReaderWriterBuildable(typeof(Dog))]
     [ModelReaderWriterBuildable(typeof(Pet))]
     [ModelReaderWriterBuildable(typeof(PetStoreData))]
+    [ModelReaderWriterBuildable(typeof(PetStoreListResult))]
     [ModelReaderWriterBuildable(typeof(PetStoreProperties))]
     [ModelReaderWriterBuildable(typeof(PetStoreResource))]
     [ModelReaderWriterBuildable(typeof(ResponseError))]
diff --git a/test/TestProjects/MgmtDiscriminator/src/Generated/Models/MgmtDiscriminatorContext.cs b/test/TestProjects/MgmtDiscriminator/src/Generated/Models/MgmtDiscriminatorContext.cs
index ee8ad29f442..05cb7be2134 100644
--- a/test/TestProjects/MgmtDiscriminator/src/Generated/Models/MgmtDiscriminatorContext.cs
+++ b/test/TestProjects/MgmtDiscriminator/src/Generated/Models/MgmtDiscriminatorContext.cs
@@ -29,6 +29,7 @@ namespace MgmtDiscriminator
     [ModelReaderWriterBuildable(typeof(DeliveryRuleCacheKeyQueryStringAction))]
     [ModelReaderWriterBuildable(typeof(DeliveryRuleCondition))]
     [ModelReaderWriterBuildable(typeof(DeliveryRuleData))]
+    [ModelReaderWriterBuildable(typeof(DeliveryRuleListResult))]
     [ModelReaderWriterBuildable(typeof(DeliveryRuleProperties))]
     [ModelReaderWriterBuildable(typeof(DeliveryRuleQueryStringCondition))]
     [ModelReaderWriterBuildable(typeof(DeliveryRuleRemoteAddressCondition))]
@@ -51,6 +52,8 @@ namespace MgmtDiscriminator
     [ModelReaderWriterBuildable(typeof(RoleAssignmentArtifact))]
     [ModelReaderWriterBuildable(typeof(RouteConfigurationOverrideActionParameters))]
     [ModelReaderWriterBuildable(typeof(Shell))]
+    [ModelReaderWriterBuildable(typeof(Sku1))]
+    [ModelReaderWriterBuildable(typeof(Sku2))]
     [ModelReaderWriterBuildable(typeof(SystemData))]
     [ModelReaderWriterBuildable(typeof(TemplateArtifact))]
     [ModelReaderWriterBuildable(typeof(Unflattened))]
diff --git a/test/TestProjects/MgmtTypeSpec/src/Generated/Models/MgmtTypeSpecContext.cs b/test/TestProjects/MgmtTypeSpec/src/Generated/Models/MgmtTypeSpecContext.cs
index 15786a4bfc7..4024f3fbcaa 100644
--- a/test/TestProjects/MgmtTypeSpec/src/Generated/Models/MgmtTypeSpecContext.cs
+++ b/test/TestProjects/MgmtTypeSpec/src/Generated/Models/MgmtTypeSpecContext.cs
@@ -19,10 +19,12 @@ namespace MgmtTypeSpec
     /// </summary>
     [ModelReaderWriterBuildable(typeof(ExtendedLocation))]
     [ModelReaderWriterBuildable(typeof(FooData))]
+    [ModelReaderWriterBuildable(typeof(FooListResult))]
     [ModelReaderWriterBuildable(typeof(FooProperties))]
     [ModelReaderWriterBuildable(typeof(FooResource))]
     [ModelReaderWriterBuildable(typeof(ManagedServiceIdentity))]
     [ModelReaderWriterBuildable(typeof(MgmtTypeSpecPrivateLinkResourceData))]
+    [ModelReaderWriterBuildable(typeof(MgmtTypeSpecPrivateLinkResourceListResult))]
     [ModelReaderWriterBuildable(typeof(MgmtTypeSpecPrivateLinkResourceProperties))]
     [ModelReaderWriterBuildable(typeof(Models.OperationStatusResult))]
     [ModelReaderWriterBuildable(typeof(ResponseError))]