diff --git a/sdk/resourcemanager/Proto.Client/authorization/Azure.ResourceManager.Authorization/Azure.ResourceManager.Authorization.csproj b/sdk/resourcemanager/Proto.Client/authorization/Azure.ResourceManager.Authorization/Azure.ResourceManager.Authorization.csproj
index 00a1e88b84232..a13135cdfd3ef 100644
--- a/sdk/resourcemanager/Proto.Client/authorization/Azure.ResourceManager.Authorization/Azure.ResourceManager.Authorization.csproj
+++ b/sdk/resourcemanager/Proto.Client/authorization/Azure.ResourceManager.Authorization/Azure.ResourceManager.Authorization.csproj
@@ -4,6 +4,7 @@
     <PackageId>Azure.ResourceManager.Authorization</PackageId>
     <Description>Azure Resource Manager client SDK for Azure resource provider Microsoft.Authorization</Description>
     <PackageTags>azure;management;arm;resource manager;authorization</PackageTags>
+    <IncludeGeneratorSharedCode>true</IncludeGeneratorSharedCode>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/sdk/resourcemanager/Proto.Client/authorization/Azure.ResourceManager.Authorization/autorest.md b/sdk/resourcemanager/Proto.Client/authorization/Azure.ResourceManager.Authorization/autorest.md
deleted file mode 100644
index face655375676..0000000000000
--- a/sdk/resourcemanager/Proto.Client/authorization/Azure.ResourceManager.Authorization/autorest.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Generated code configuration
-
-Run `dotnet build /t:GenerateCode` to generate code.
-
-``` yaml
-
-azure-arm: true
-require: https://raw.githubusercontent.com/Azure/azure-rest-api-specs/f0a0a9f0ab2278885f9349ef03bf02d4790f28ec/specification/authorization/resource-manager/readme.md
- 
-
-```
\ No newline at end of file
diff --git a/sdk/resourcemanager/Proto.Client/network/SubnetContainer.cs b/sdk/resourcemanager/Proto.Client/network/SubnetContainer.cs
index 51da32cf51e44..6566d5a1ed2c1 100644
--- a/sdk/resourcemanager/Proto.Client/network/SubnetContainer.cs
+++ b/sdk/resourcemanager/Proto.Client/network/SubnetContainer.cs
@@ -90,9 +90,9 @@ public SubnetBuilder Construct(string subnetCidr, NetworkSecurityGroupData group
         /// </summary>
         /// <param name="cancellationToken"> A token to allow the caller to cancel the call to the service. The default value is <see cref="P:System.Threading.CancellationToken.None" />. </param>
         /// <returns> A collection of resource operations that may take multiple service requests to iterate over. </returns>
-        public Pageable<SubnetOperations> List(CancellationToken cancellationToken = default)
+        public Pageable<Subnet> List(CancellationToken cancellationToken = default)
         {
-            return new PhWrappingPageable<Azure.ResourceManager.Network.Models.Subnet, SubnetOperations>(
+            return new PhWrappingPageable<Azure.ResourceManager.Network.Models.Subnet, Subnet>(
                 Operations.List(Id.ResourceGroup, Id.Name, cancellationToken),
                 convertor());
         }
@@ -102,9 +102,9 @@ public Pageable<SubnetOperations> List(CancellationToken cancellationToken = def
         /// </summary>
         /// <param name="cancellationToken"> A token to allow the caller to cancel the call to the service. The default value is <see cref="P:System.Threading.CancellationToken.None" />. </param>
         /// <returns> An async collection of resource operations that may take multiple service requests to iterate over. </returns>
-        public AsyncPageable<SubnetOperations> ListAsync(CancellationToken cancellationToken = default)
+        public AsyncPageable<Subnet> ListAsync(CancellationToken cancellationToken = default)
         {
-            return new PhWrappingAsyncPageable<Azure.ResourceManager.Network.Models.Subnet, SubnetOperations>(
+            return new PhWrappingAsyncPageable<Azure.ResourceManager.Network.Models.Subnet, Subnet>(
                 Operations.ListAsync(Id.ResourceGroup, Id.Name, cancellationToken),
                 convertor());
         }
diff --git a/sdk/resourcemanager/Proto.Client/src/Program.cs b/sdk/resourcemanager/Proto.Client/src/Program.cs
index 1e4f6ee5de7a0..380b481f7f9cc 100644
--- a/sdk/resourcemanager/Proto.Client/src/Program.cs
+++ b/sdk/resourcemanager/Proto.Client/src/Program.cs
@@ -10,7 +10,7 @@ static void Main(string[] args)
             Scenario scenario = null;
             try
             {
-                scenario = ScenarioFactory.GetScenario(Scenarios.CreateSingleVmExample);
+                scenario = ScenarioFactory.GetScenario(Scenarios.GetByContainersAsync);
                 scenario.Execute();
             }
             finally
diff --git a/sdk/resourcemanager/Proto.Client/src/Scenarios/GetByContainerAsync.cs b/sdk/resourcemanager/Proto.Client/src/Scenarios/GetByContainerAsync.cs
index 13c50526d4e50..638b89da02b69 100644
--- a/sdk/resourcemanager/Proto.Client/src/Scenarios/GetByContainerAsync.cs
+++ b/sdk/resourcemanager/Proto.Client/src/Scenarios/GetByContainerAsync.cs
@@ -33,9 +33,8 @@ private async Task ExecuteAsync()
                 Debug.Assert(virtualNetwork.Value.Data.Name.Equals(response.Data.Id.Name));
                 await foreach (var subnetResponse in response.GetSubnetContainer().ListAsync())
                 {
-                    var actualSubnet = await subnetResponse.GetAsync();
-                    var subnets = await response.GetSubnetContainer().GetAsync(actualSubnet.Value.Data.Name);
-                    Debug.Assert(subnets.Value.Data.Name.Equals(actualSubnet.Value.Data.Name));
+                    var subnets = await response.GetSubnetContainer().GetAsync(subnetResponse.Data.Name);
+                    Debug.Assert(subnets.Value.Data.Name.Equals(subnetResponse.Data.Name));
                 }
             }
             Console.WriteLine("\nDone all asserts passed ...");
diff --git a/sdk/resourcemanager/Proto.Client/src/Scenarios/GetByContainers.cs b/sdk/resourcemanager/Proto.Client/src/Scenarios/GetByContainers.cs
index 6358e890ab3da..602c535c52d16 100644
--- a/sdk/resourcemanager/Proto.Client/src/Scenarios/GetByContainers.cs
+++ b/sdk/resourcemanager/Proto.Client/src/Scenarios/GetByContainers.cs
@@ -28,9 +28,8 @@ public override void Execute()
                 Debug.Assert(virtualNetwork.Value.Data.Name.Equals(response.Data.Id.Name));
                 foreach (var subnetResponse in response.GetSubnetContainer().List())
                 {
-                    var actualSubnet = subnetResponse.Get();
-                    var subnets = response.GetSubnetContainer().Get(actualSubnet.Value.Data.Name);
-                    Debug.Assert(subnets.Value.Data.Name.Equals(actualSubnet.Value.Data.Name));
+                    var subnets = response.GetSubnetContainer().Get(subnetResponse.Data.Name);
+                    Debug.Assert(subnets.Value.Data.Name.Equals(subnetResponse.Data.Name));
                 }
             }
             Console.WriteLine("\nDone all asserts passed ...");